From 0d5587b5d128d9dd502a3b78c02fb986b33d92c4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 26 Apr 2006 12:22:54 +0000 Subject: [PATCH] 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) --- source4/auth/config.m4 | 4 ++-- source4/auth/config.mk | 2 +- source4/auth/kerberos/config.m4 | 4 ++-- source4/build/m4/check_path.m4 | 2 +- source4/build/m4/public.m4 | 24 +++++++----------------- source4/build/smb_build/summary.pm | 6 +++--- source4/gtk/config.m4 | 2 +- source4/gtk/config.mk | 2 +- source4/heimdal_build/config.m4 | 6 +++--- source4/heimdal_build/config.mk | 10 +++++----- source4/lib/charset/config.mk | 2 +- source4/lib/ldb/config.mk | 2 +- source4/lib/ldb/ldap.m4 | 2 +- source4/lib/ldb/sqlite3.m4 | 2 +- source4/lib/popt/config.m4 | 7 ++----- source4/lib/registry/config.m4 | 2 +- source4/lib/registry/config.mk | 2 +- source4/lib/replace/readline.m4 | 6 +++--- source4/lib/socket/config.m4 | 4 ++-- source4/lib/socket/config.mk | 6 +++--- source4/lib/tls/config.m4 | 2 +- source4/lib/tls/config.mk | 2 +- source4/lib/util/config.mk | 2 +- source4/ntvfs/posix/config.m4 | 4 ++-- source4/ntvfs/posix/config.mk | 2 +- source4/smbd/process_model.m4 | 4 ++-- source4/smbd/process_model.mk | 4 ++-- source4/utils/config.mk | 2 +- 28 files changed, 53 insertions(+), 66 deletions(-) diff --git a/source4/auth/config.m4 b/source4/auth/config.m4 index db5b1e1dc116..2bf37dc8550e 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 9ce50ab978e6..3d42da6d615c 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 672c630d299a..bf14ca0ee4e4 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 diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 396933df52e2..283fef312fe8 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -162,6 +162,6 @@ AC_ARG_WITH(disable-ext-lib, [ if test $withval; then for i in `echo $withval | sed -e's/,/ /g'` do - eval SMB_EXT_LIB_$i=NO + eval SMB_$i=NO done fi ]) diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 6e8be7fa5e25..5ac9b24b3fae 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -6,8 +6,6 @@ dnl Published under the GPL dnl dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems) dnl -dnl SMB_EXT_LIB_ENABLE(name,default_build) -dnl dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name) dnl dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) @@ -37,14 +35,6 @@ ENABLE = YES " ]) -dnl SMB_EXT_LIB_ENABLE(name,default_build) -AC_DEFUN([SMB_EXT_LIB_ENABLE], -[ -[SMB_EXT_LIB_ENABLE_][$1]="$2" -SMB_INFO_ENABLES="$SMB_INFO_ENABLES -\$enabled{EXT_LIB_$1} = \"$2\";" -]) - dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name) AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], [ @@ -60,13 +50,13 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." SMB_EXT_LIB($1) - SMB_EXT_LIB_ENABLE($1, NO) + SMB_ENABLE($1, NO) else if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then AC_MSG_CHECKING(for $2) - if test "$SMB_EXT_LIB_$1"x = "NO"x ; then - SMB_EXT_LIB_ENABLE($1, NO) + if test "$SMB_$1"x = "NO"x ; then + SMB_ENABLE($1, NO) AC_MSG_RESULT(disabled) elif $PKG_CONFIG --exists '$2' ; then AC_MSG_RESULT(yes) @@ -77,7 +67,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], CFLAGS="$CFLAGS $$1_CFLAGS" AC_MSG_CHECKING([that the C compiler can use the $1_CFLAGS]) AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"], - SMB_EXT_LIB_ENABLE($1, YES) + SMB_ENABLE($1, YES) AC_MSG_RESULT(yes), AC_MSG_RESULT(no), AC_MSG_WARN([cannot run when cross-compiling])) @@ -92,7 +82,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], else SMB_EXT_LIB($1) - SMB_EXT_LIB_ENABLE($1, NO) + SMB_ENABLE($1, NO) AC_MSG_RESULT(no) $PKG_CONFIG --errors-to-stdout --print-errors '$2' fi @@ -100,7 +90,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" SMB_EXT_LIB($1) - SMB_EXT_LIB_ENABLE($1, NO) + SMB_ENABLE($1, NO) fi fi ]) @@ -112,7 +102,7 @@ AC_DEFUN([SMB_EXT_LIB], SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS ################################### # Start Ext Lib $1 -@<:@EXT_LIB::EXT_LIB_$1@:>@ +@<:@EXT_LIB::$1@:>@ LIBS = $2 CFLAGS = $3 CPPFLAGS = $4 diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm index b0dfbb5a16d2..d61d41a7264a 100644 --- a/source4/build/smb_build/summary.pm +++ b/source4/build/smb_build/summary.pm @@ -21,7 +21,7 @@ sub showitem($$$) my @need = (); foreach (@$items) { - if (!enabled($output->{"EXT_LIB_$_"}->{ENABLE})) { + if (!enabled($output->{$_}->{ENABLE})) { push (@need, $_); } } @@ -42,13 +42,13 @@ sub show($$) showitem($output, "GTK+ frontends", ["gtk","gconf"]); showitem($output, "SSL in SWAT", ["GNUTLS"]); showitem($output, "threads in smbd (see --with-pthread)", ["PTHREAD"]); - showitem($output, "intelligent command line editing", ["READLINE"]); + showitem($output, "intelligent command line editing", ["EXT_READLINE"]); showitem($output, "changing process titles (see --with-setproctitle)", ["SETPROCTITLE"]); showitem($output, "using extended attributes", ["XATTR"]); showitem($output, "using libblkid", ["BLKID"]); showitem($output, "using pam", ["PAM"]); print "Using external popt: ". - (enabled($output->{EXT_LIB_POPT}->{ENABLE})?"yes":"no")."\n"; + (($output->{LIBPOPT}->{TYPE} eq "EXT_LIB")?"yes":"no")."\n"; print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n"; print "Automatic dependencies: ". (enabled($config->{automatic_dependencies}) diff --git a/source4/gtk/config.m4 b/source4/gtk/config.m4 index c15d93ddef11..e2056b2f4fab 100644 --- a/source4/gtk/config.m4 +++ b/source4/gtk/config.m4 @@ -7,7 +7,7 @@ SMB_ENABLE(gwcrontab, NO) SMB_ENABLE(gwsam, NO) SMB_ENABLE(gepdump, NO) -if test t$SMB_EXT_LIB_ENABLE_gtk = tYES; then +if test t$SMB_ENABLE_gtk = tYES; then SMB_ENABLE(GTKSMB, YES) SMB_ENABLE(gregedit, YES) SMB_ENABLE(gwcrontab, YES) diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk index 42511df8be6d..b187c81f64f2 100644 --- a/source4/gtk/config.mk +++ b/source4/gtk/config.mk @@ -9,7 +9,7 @@ OBJ_FILES = common/gtk-smb.o \ common/select.o \ common/gtk_events.o \ common/credentials.o -PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL EXT_LIB_gtk RPC_NDR_SAMR +PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL gtk RPC_NDR_SAMR [BINARY::gregedit] INSTALLDIR = BINDIR diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4 index 49ff61938668..0f3596cd0fa2 100644 --- a/source4/heimdal_build/config.m4 +++ b/source4/heimdal_build/config.m4 @@ -196,7 +196,7 @@ dnl This fills in the global LIBS... rk_RESOLV dnl AC_CHECK_LIB_EXT(resolv, RESOLV_LIBS, res_search) - SMB_EXT_LIB_ENABLE(RESOLV,YES) + SMB_ENABLE(RESOLV,YES) if test x"$LIBS" != "x"; then RESOLV_LIBS=$LIBS @@ -240,7 +240,7 @@ fi if test x"$ac_cv_func_inet_pton" = x"no"; then AC_CHECK_LIB_EXT(nsl_s, NSL_LIBS, inet_pton) AC_CHECK_LIB_EXT(nsl, NSL_LIBS, inet_pton) - SMB_EXT_LIB_ENABLE(NSL,YES) + SMB_ENABLE(NSL,YES) if test x"$ac_cv_lib_ext_nsl_s_inet_pton" != x"yes" && test x"$ac_cv_lib_ext_nsl_inet_pton" != x"yes"; then AC_MSG_ERROR([no inet_pton() function available!]) @@ -272,7 +272,7 @@ if test t$ac_cv_func_gai_strerror != tyes; then test x"$ac_cv_lib_ext_socket_gai_strerror" = x"yes" || test x"$ac_cv_lib_ext_xnet_gai_strerror" = x"yes"; then AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether the system has gai_strerror()]) - SMB_EXT_LIB_ENABLE(GAI, YES) + SMB_ENABLE(GAI, YES) else SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, YES) fi diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 3adf1b119913..4f2d3a2456ec 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -317,7 +317,7 @@ OBJ_FILES = \ ../heimdal/lib/roken/freehostent.o \ ../heimdal/lib/roken/copyhostent.o \ ../heimdal/lib/roken/hostent_find_fqdn.o -PRIVATE_DEPENDENCIES = EXT_LIB_SOCKET +PRIVATE_DEPENDENCIES = SOCKET ####################### # Start SUBSYSTEM HEIMDAL_ROKEN @@ -349,8 +349,8 @@ PUBLIC_DEPENDENCIES = \ HEIMDAL_ROKEN_GAI_STRERROR \ HEIMDAL_ROKEN_INET_ATON \ HEIMDAL_ROKEN_GETPROGNAME \ - EXT_LIB_GAI \ - EXT_LIB_NSL + GAI \ + NSL # End SUBSYSTEM HEIMDAL_ROKEN ####################### @@ -480,14 +480,14 @@ CFLAGS = -Iheimdal_build OBJ_FILES = ../heimdal/lib/vers/print_version.o PUBLIC_DEPENDENCIES = \ LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \ - HEIMDAL_GLUE EXT_LIB_RESOLV + HEIMDAL_GLUE RESOLV # End SUBSYSTEM HEIMDAL ####################### ####################### # Start SUBSYSTEM KERBEROS_LIB [SUBSYSTEM::KERBEROS_LIB] -#PUBLIC_DEPENDENCIES = EXT_LIB_KRB5 +#PUBLIC_DEPENDENCIES = EXT_KRB5 PUBLIC_DEPENDENCIES = HEIMDAL # End SUBSYSTEM KERBEROS_LIB ####################### diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 023bd5c5883d..fc49ffc70f28 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -6,6 +6,6 @@ OBJ_FILES = \ charcnv.o PUBLIC_HEADERS = charset.h PUBLIC_PROTO_HEADER = charset_proto.h -PUBLIC_DEPENDENCIES = EXT_LIB_ICONV +PUBLIC_DEPENDENCIES = ICONV # End SUBSYSTEM CHARSET ################################################ diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 60eb9e898424..6f6f441c7b25 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -106,7 +106,7 @@ INIT_FUNCTION = ldb_sqlite3_init OBJ_FILES = \ ldb_sqlite3/ldb_sqlite3.o PUBLIC_DEPENDENCIES = \ - EXT_LIB_SQLITE3 + SQLITE3 # End MODULE ldb_sqlite3 ################################################ diff --git a/source4/lib/ldb/ldap.m4 b/source4/lib/ldb/ldap.m4 index 716b66e07fe6..911c1364c89a 100644 --- a/source4/lib/ldb/ldap.m4 +++ b/source4/lib/ldb/ldap.m4 @@ -72,7 +72,7 @@ if test x"$with_ldap_support" != x"no"; then with_ldap_support=yes AC_MSG_CHECKING(whether LDAP support is used) AC_MSG_RESULT(yes) - SMB_EXT_LIB_ENABLE(LDAP,YES) + SMB_ENABLE(LDAP,YES) else if test x"$with_ldap_support" = x"yes"; then AC_MSG_ERROR(libldap is needed for LDAP support) diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index 352085da74d2..49e3807730a5 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -43,7 +43,7 @@ if test x"$with_sqlite3_support" != x"no"; then AC_MSG_CHECKING(whether SQLITE3 support is used) AC_MSG_RESULT(yes) with_sqlite3_support=yes - SMB_EXT_LIB_ENABLE(SQLITE3,YES) + SMB_ENABLE(SQLITE3,YES) else if test x"$with_sqlite3_support" = x"yes"; then AC_MSG_ERROR(libsqlite3 is needed for SQLITE3 support) diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 index 41d49993e05b..62003f9e1684 100644 --- a/source4/lib/popt/config.m4 +++ b/source4/lib/popt/config.m4 @@ -31,11 +31,8 @@ if test x"$INCLUDED_POPT" != x"no"; then [INT_LIB_POPT]) AC_MSG_RESULT(yes) else - SMB_SUBSYSTEM(LIBPOPT, - [], - [EXT_LIB_POPT]) - SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) - SMB_EXT_LIB_ENABLE(POPT,YES) + SMB_EXT_LIB(LIBPOPT, [${TMP_LIBPOPT_LIBS}]) + SMB_ENABLE(LIBPOPT,YES) AC_MSG_RESULT(no) fi diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4 index af885825ee9b..852c74b4abfc 100644 --- a/source4/lib/registry/config.m4 +++ b/source4/lib/registry/config.m4 @@ -7,6 +7,6 @@ AC_ARG_ENABLE(reg-gconf, [ --enable-reg-gconf Enable support for GConf registry backend], [ if test t$enable = tyes; then - SMB_ENABLE(registry_gconf, $SMB_EXT_LIB_ENABLE_gconf) + SMB_ENABLE(registry_gconf, $SMB_ENABLE_gconf) fi ]) diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 2f80716fd2d5..981e852311ad 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -70,7 +70,7 @@ INIT_FUNCTION = registry_gconf_init SUBSYSTEM = registry OBJ_FILES = \ reg_backend_gconf.o -PUBLIC_DEPENDENCIES = EXT_LIB_gconf +PUBLIC_DEPENDENCIES = gconf # End MODULE registry_gconf ################################################ diff --git a/source4/lib/replace/readline.m4 b/source4/lib/replace/readline.m4 index 2e42befd6f64..b71ced7eb7d2 100644 --- a/source4/lib/replace/readline.m4 +++ b/source4/lib/replace/readline.m4 @@ -72,9 +72,9 @@ AC_MSG_CHECKING(whether to use extern readline) if test x"$EXTERNAL_READLINE" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) - SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE EXT_LIB_READLINE]) - SMB_EXT_LIB(READLINE, [${TERMLIBS}]) - SMB_EXT_LIB_ENABLE(READLINE,YES) + SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE EXT_READLINE]) + SMB_EXT_LIB(EXT_READLINE, [${TERMLIBS}]) + SMB_ENABLE(EXT_READLINE,YES) else SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE]) AC_MSG_RESULT(no) diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4 index 4f76f3b6d4bf..45e5406f0c1a 100644 --- a/source4/lib/socket/config.m4 +++ b/source4/lib/socket/config.m4 @@ -22,7 +22,7 @@ if test x"$ac_cv_func_connect" = x"no"; then AC_CHECK_LIB_EXT(nsl, SOCKET_LIBS, connect) AC_CHECK_LIB_EXT(socket, SOCKET_LIBS, connect) AC_CHECK_LIB_EXT(inet, SOCKET_LIBS, connect) - SMB_EXT_LIB_ENABLE(SOCKET,YES) + SMB_ENABLE(EXT_SOCKET,YES) dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value dnl has been cached. if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" || @@ -35,7 +35,7 @@ if test x"$ac_cv_func_connect" = x"no"; then fi fi -SMB_EXT_LIB(SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}]) +SMB_EXT_LIB(EXT_SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}]) ############################################ # check for unix domain sockets diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index fe4e00eedf7e..d56539b80837 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -6,7 +6,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv4.o -PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_SOCKET # End MODULE socket_ipv4 ################################################ @@ -17,7 +17,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv6.o -PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_SOCKET # End MODULE socket_ipv6 ################################################ @@ -28,7 +28,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_unix.o -PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_SOCKET # End MODULE socket_unix ################################################ diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4 index c16da9fd467b..3d81c6692ab6 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 diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index e68636e700ae..2ab296049b94 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 ################################################ diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 89e2a4c048e8..4e81725ea5a7 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -32,7 +32,7 @@ OBJ_FILES = xfile.o \ idtree.o \ module.o PUBLIC_DEPENDENCIES = \ - CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \ + CHARSET LIBREPLACE LIBCRYPTO DL LIBTALLOC \ SOCKET_WRAPPER \ # for the base64 functions ldb diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4 index 37c2b57cf100..8d8b07810cde 100644 --- a/source4/ntvfs/posix/config.m4 +++ b/source4/ntvfs/posix/config.m4 @@ -30,7 +30,7 @@ AC_CHECK_FUNC_EXT(flistxattr, $XATTR_LIBS) SMB_EXT_LIB(XATTR,[${XATTR_LIBS}],[${XATTR_CFLAGS}],[${XATTR_CPPFLAGS}],[${XATTR_LDFLAGS}]) if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support]) - SMB_EXT_LIB_ENABLE(XATTR,YES) + SMB_ENABLE(XATTR,YES) fi AC_CHECK_HEADERS(blkid/blkid.h) @@ -39,5 +39,5 @@ AC_CHECK_FUNC_EXT(blkid_get_cache, $BLKID_LIBS) SMB_EXT_LIB(BLKID,[${BLKID_LIBS}],[${BLKID_CFLAGS}],[${BLKID_CPPFLAGS}],[${BLKID_LDFLAGS}]) if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)]) - SMB_EXT_LIB_ENABLE(BLKID,YES) + SMB_ENABLE(BLKID,YES) fi diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index b3c6a54904e2..32ede78cc97e 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -32,6 +32,6 @@ OBJ_FILES = \ pvfs_notify.o \ xattr_system.o \ xattr_tdb.o -PUBLIC_DEPENDENCIES = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID ntvfs_common +PUBLIC_DEPENDENCIES = NDR_XATTR XATTR BLKID ntvfs_common # End MODULE ntvfs_posix ################################################ diff --git a/source4/smbd/process_model.m4 b/source4/smbd/process_model.m4 index 6f712a07b20f..6ee8dbf4d8fa 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 9297c6b986ba..6032c1cae6c8 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 ################################################ diff --git a/source4/utils/config.mk b/source4/utils/config.mk index 7e235f9eb323..53ae16a789bd 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -44,7 +44,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ NDR_XATTR \ - EXT_LIB_XATTR + XATTR # End BINARY getntacl ################################# -- 2.34.1