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

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-23 15:34:47 +0000 (Sun, 23 Apr 2006)
New Revision: 15179

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

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

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-04-23 15:30:40 UTC (rev 15178)
+++ branches/SAMBA_4_0/source/smbd/process_model.m4	2006-04-23 15:34:47 UTC (rev 15179)
@@ -32,12 +32,15 @@
 	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)