From 0d5587b5d128d9dd502a3b78c02fb986b33d92c4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 26 Apr 2006 12:22:54 +0000
Subject: 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/heimdal_build/config.m4 |  6 +++---
 source4/heimdal_build/config.mk | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source4/heimdal_build')

diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 49ff619386..0f3596cd0f 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 3adf1b1199..4f2d3a2456 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
 #######################
-- 
cgit