diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-26 12:22:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:00 -0500 |
| commit | 0d5587b5d128d9dd502a3b78c02fb986b33d92c4 (patch) | |
| tree | d5165c0eaf4424edaefca4422319afe84d4c7852 /source4/smbd | |
| parent | 7ffe0fcaee413de96ec9c3d4fdeaab6c2f106578 (diff) | |
| download | samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.tar.gz samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.tar.bz2 samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.zip | |
r15274: Drop default EXT_LIB_ prefix for external libraries. Fixes issues with local
(empty) libpopt.a overriding global one
(This used to be commit 2f06305e53478e5030c24550954f221a9a97c83f)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_model.m4 | 4 | ||||
| -rw-r--r-- | source4/smbd/process_model.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4 index 6f712a07b2..6ee8dbf4d8 100644 --- a/source4/smbd/process_model.m4 +++ b/source4/smbd/process_model.m4 @@ -14,7 +14,7 @@ AC_ARG_WITH(pthreads, AC_MSG_ERROR([You cannot enable threads when you don't have pread/pwrite!]) fi SMB_ENABLE(process_model_thread,YES) - SMB_EXT_LIB_ENABLE(PTHREAD,YES) + SMB_ENABLE(PTHREAD,YES) ;; *) AC_MSG_RESULT(no) @@ -40,7 +40,7 @@ AC_ARG_WITH(setproctitle, \( 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) + SMB_ENABLE(SETPROCTITLE, YES) AC_DEFINE(HAVE_SETPROCTITLE,1,[Whether setproctitle() is available]) else AC_MSG_RESULT(no) diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index 9297c6b986..6032c1cae6 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -18,7 +18,7 @@ INIT_FUNCTION = process_model_standard_init SUBSYSTEM = process_model OBJ_FILES = \ process_standard.o -PUBLIC_DEPENDENCIES = EXT_LIB_SETPROCTITLE +PUBLIC_DEPENDENCIES = SETPROCTITLE PRIVATE_DEPENDENCIES = KERBEROS_LIB # End MODULE process_model_standard ################################################ @@ -30,7 +30,7 @@ INIT_FUNCTION = process_model_thread_init SUBSYSTEM = process_model OBJ_FILES = \ process_thread.o -PUBLIC_DEPENDENCIES = EXT_LIB_PTHREAD +PUBLIC_DEPENDENCIES = PTHREAD # End MODULE process_model_thread ################################################ |