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)

13 files changed, 19 insertions, 22 deletions

diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index 023bd5c588..fc49ffc70f 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 60eb9e8984..6f6f441c7b 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 716b66e07f..911c1364c8 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 352085da74..49e3807730 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 41d49993e0..62003f9e16 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 af885825ee..852c74b4ab 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 2f80716fd2..981e852311 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 2e42befd6f..b71ced7eb7 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 4f76f3b6d4..45e5406f0c 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 fe4e00eedf..d56539b808 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 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
 ################################################
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 89e2a4c048..4e81725ea5 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