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/auth | |
| 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/auth')
| -rw-r--r-- | source4/auth/config.m4 | 4 | ||||
| -rw-r--r-- | source4/auth/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/kerberos/config.m4 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4 index db5b1e1dc1..2bf37dc855 100644 --- a/source4/auth/config.m4 +++ b/source4/auth/config.m4 @@ -4,7 +4,7 @@ AC_CHECK_HEADERS(security/pam_appl.h) AC_CHECK_LIB_EXT(pam, PAM_LIBS, pam_start) if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then - SMB_EXT_LIB_ENABLE(PAM,YES) + SMB_ENABLE(PAM,YES) fi SMB_EXT_LIB(PAM, $PAM_LIBS) # end SMB_EXT_LIB_PAM @@ -13,5 +13,5 @@ SMB_EXT_LIB(PAM, $PAM_LIBS) ################################################ # test for where we get crypt() from AC_CHECK_LIB_EXT(crypt, CRYPT_LIBS, crypt) -SMB_EXT_LIB_ENABLE(CRYPT,YES) +SMB_ENABLE(CRYPT,YES) SMB_EXT_LIB(CRYPT, $CRYPT_LIBS) diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 9ce50ab978..3d42da6d61 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -60,7 +60,7 @@ SUBSYSTEM = auth OBJ_FILES = \ auth_unix.o PUBLIC_DEPENDENCIES = \ - EXT_LIB_CRYPT EXT_LIB_PAM PAM_ERRORS + CRYPT PAM PAM_ERRORS # End MODULE auth_unix ####################### diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4 index 672c630d29..bf14ca0ee4 100644 --- a/source4/auth/kerberos/config.m4 +++ b/source4/auth/kerberos/config.m4 @@ -477,7 +477,7 @@ if test x"$with_krb5_support" != x"no"; then if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support]) AC_MSG_CHECKING(whether KRB5 support is used) - SMB_EXT_LIB_ENABLE(KRB5,YES) + SMB_ENABLE(KRB5,YES) AC_MSG_RESULT(yes) echo "KRB5_CFLAGS: ${KRB5_CFLAGS}" echo "KRB5_CPPFLAGS: ${KRB5_CPPFLAGS}" @@ -510,7 +510,7 @@ if test x"$with_krb5_support" != x"no"; then if test x"$ac_cv_header_kdc_h" = x"yes"; then if test x"$ac_cv_lib_ext_kdc_krb5_kdc_default_config" = x"yes"; then if test x"$ac_cv_lib_ext_hdb_hdb_generate_key_set_password" = x"yes"; then - SMB_EXT_LIB_ENABLE(KDC,YES) + SMB_ENABLE(KDC,YES) AC_MSG_RESULT(yes) echo "KDC_LIBS: ${KDC_LIBS}" else |