diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-23 15:34:47 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:13 -0500 |
commit | 5bcc0986ea94eacf5599df98bfaa0617b65a3f4a (patch) | |
tree | eaaaa53bdfeecc963fb6634b13fa5b65f939dcb1 /source4/smbd | |
parent | 8fe1aa195b247201f01c4f5a32121b2ace132d8c (diff) | |
download | samba-5bcc0986ea94eacf5599df98bfaa0617b65a3f4a.tar.gz samba-5bcc0986ea94eacf5599df98bfaa0617b65a3f4a.tar.bz2 samba-5bcc0986ea94eacf5599df98bfaa0617b65a3f4a.zip |
r15179: Detect setproctitle if it is in libc. Patch by Timur Bakevey
(This used to be commit 3ebdae4217be9c00150ae4ceb76c94ba619bbf6a)
Diffstat (limited to 'source4/smbd')
-rw-r--r-- | source4/smbd/process_model.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4 index 6e905d4f5a..77dfe1f3b1 100644 --- 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) |