summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-09 20:30:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:56:50 -0500
commit2239cb4ec4a3594d34f5c7eeabb502d8ad027ea6 (patch)
tree0339031caadbebc20c7eef8130c5238721b546b9
parent306b12ad4943737f6810df9237ab93b64c931fbd (diff)
downloadsamba-2239cb4ec4a3594d34f5c7eeabb502d8ad027ea6.tar.gz
samba-2239cb4ec4a3594d34f5c7eeabb502d8ad027ea6.tar.bz2
samba-2239cb4ec4a3594d34f5c7eeabb502d8ad027ea6.zip
r14095: disable setproctitle support by default
--with-setproctitle enables it metze (This used to be commit fb9e7d176a3379d451bdbfad567426ddfb91a8bf)
-rw-r--r--source4/smbd/process_model.m434
1 files changed, 24 insertions, 10 deletions
diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4
index ea7373e4f7..6e905d4f5a 100644
--- a/source4/smbd/process_model.m4
+++ b/source4/smbd/process_model.m4
@@ -25,16 +25,30 @@ AC_MSG_RESULT(no)
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}],