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/build/smb_build | |
| 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/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/summary.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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}) |