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/lib/tls | |
| 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/lib/tls')
| -rw-r--r-- | source4/lib/tls/config.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/tls/config.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4 index c16da9fd46..3d81c6692a 100644 --- a/source4/lib/tls/config.m4 +++ b/source4/lib/tls/config.m4 @@ -7,7 +7,7 @@ AC_CHECK_HEADERS(gnutls/gnutls.h) AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init) if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes";then - SMB_EXT_LIB_ENABLE(GNUTLS,YES) + SMB_ENABLE(GNUTLS,YES) AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id, [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [ #include <gnutls/gnutls.h> diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index e68636e700..2ab296049b 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = \ tls.o \ tlscert.o PUBLIC_DEPENDENCIES = \ - LIBTALLOC EXT_LIB_GNUTLS LIBSAMBA-CONFIG + LIBTALLOC GNUTLS LIBSAMBA-CONFIG # # End SUBSYSTEM LIBTLS ################################################ |