svn commit: samba r14095 - in branches/SAMBA_4_0/source/smbd: .

metze at samba.org metze at samba.org
Thu Mar 9 20:30:37 GMT 2006


Author: metze
Date: 2006-03-09 20:30:36 +0000 (Thu, 09 Mar 2006)
New Revision: 14095

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14095

Log:
disable setproctitle support by default

--with-setproctitle enables it

metze
Modified:
   branches/SAMBA_4_0/source/smbd/process_model.m4


Changeset:
Modified: branches/SAMBA_4_0/source/smbd/process_model.m4
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_model.m4	2006-03-09 19:55:04 UTC (rev 14094)
+++ branches/SAMBA_4_0/source/smbd/process_model.m4	2006-03-09 20:30:36 UTC (rev 14095)
@@ -25,16 +25,30 @@
 
 SMB_EXT_LIB(PTHREAD,[-lpthread])
 
-AC_CHECK_HEADERS(setproctitle.h)
-AC_CHECK_LIB_EXT(setproctitle, SETPROCTITLE_LIBS, setproctitle)
-AC_MSG_CHECKING(whether to use setproctitle)
-if test x"$ac_cv_header_setproctitle_h" = x"yes" -a x"$ac_cv_lib_ext_setproctitle_setproctitle" = x"yes"; then
-	AC_MSG_RESULT(yes)
-	SMB_EXT_LIB_ENABLE(SETPROCTITLE,YES)
-	AC_DEFINE(HAVE_SETPROCTITLE,1,[Whether setproctitle() is available])
-else 
-	AC_MSG_RESULT(no)
-fi
+AC_MSG_CHECKING(whether to search for setproctitle support)
+AC_ARG_WITH(setproctitle,
+[  --with-setproctitle          Search for setproctitle support (default=no)],
+[ case "$withval" in
+	yes)
+		AC_MSG_RESULT(yes)
+		AC_CHECK_HEADERS(setproctitle.h)
+		AC_CHECK_LIB_EXT(setproctitle, SETPROCTITLE_LIBS, setproctitle)
+		AC_MSG_CHECKING(whether to use setproctitle)
+		if test x"$ac_cv_header_setproctitle_h" = x"yes" -a \
+		   x"$ac_cv_lib_ext_setproctitle_setproctitle" = x"yes"; then
+			AC_MSG_RESULT(yes)
+			SMB_EXT_LIB_ENABLE(SETPROCTITLE,YES)
+			AC_DEFINE(HAVE_SETPROCTITLE,1,[Whether setproctitle() is available])
+		else 
+			AC_MSG_RESULT(no)
+		fi
+	;;
+	*)
+		AC_MSG_RESULT(no)
+	;;
+  esac ],
+AC_MSG_RESULT(no)
+)
 
 SMB_EXT_LIB(SETPROCTITLE,
 	[${SETPROCTITLE_LIBS}],



More information about the samba-cvs mailing list