r15179: Detect setproctitle if it is in libc. Patch by Timur Bakevey

(This used to be commit 3ebdae4217be9c00150ae4ceb76c94ba619bbf6a)

diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4
index 6e905d4f5a8caa3373cf09d4aed99e49478fe5d9..77dfe1f3b16f95371b4b07ebc38f4939dc9229e2 100644 (file)
--- a/source4/smbd/process_model.m4
+++ b/source4/smbd/process_model.m4
@@ -32,12 +32,15 @@ AC_ARG_WITH(setproctitle,
        yes)
                AC_MSG_RESULT(yes)
                AC_CHECK_HEADERS(setproctitle.h)
-               AC_CHECK_LIB_EXT(setproctitle, SETPROCTITLE_LIBS, setproctitle)
+               AC_CHECK_FUNC(setproctitle, [], [
+                  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
+                 if test x"$ac_cv_func_setproctitle" = x"yes" ||
+                   ( x"$ac_cv_header_setproctitle_h" = x"yes" &&
+                   x"$ac_cv_lib_ext_setproctitle_setproctitle" = x"yes" ); then
                        AC_MSG_RESULT(yes)
-                       SMB_EXT_LIB_ENABLE(SETPROCTITLE,YES)
+                       SMB_EXT_LIB_ENABLE(SETPROCTITLE, YES)
                        AC_DEFINE(HAVE_SETPROCTITLE,1,[Whether setproctitle() is available])
                else 
                        AC_MSG_RESULT(no)