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/build/smb_build/summary.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/build/smb_build')

diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index b0dfbb5a16..d61d41a726 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})
-- 
cgit