summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-24 17:05:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:28:31 -0500
commit9a1f380d5b49d18b598891ad1e65a6c06fe6b251 (patch)
tree5f614ed2685d459ddb516e4e09d41c0a6fe183bd /source4
parentd25f2ba3dc87dc9eb343e9a6caced475ef956bd5 (diff)
downloadsamba-9a1f380d5b49d18b598891ad1e65a6c06fe6b251.tar.gz
samba-9a1f380d5b49d18b598891ad1e65a6c06fe6b251.tar.bz2
samba-9a1f380d5b49d18b598891ad1e65a6c06fe6b251.zip
r19882: Fix static link flags in pkg-config files. Should allow running
pidl tests on systems without shared libs. (This used to be commit fb623be4ff09c2fb0546edc0892ad3a59d58f274)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm15
1 files changed, 11 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 3d5b5223d5..b86dbb591d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -415,17 +415,24 @@ sub PkgConfig($$$)
if (defined($ctx->{PUBLIC_DEPENDENCIES})) {
foreach (@{$ctx->{PUBLIC_DEPENDENCIES}}) {
- next unless ($other->{$_}->{TYPE} eq "LIBRARY");
+ next if ($other->{$_}->{ENABLE} eq "NO");
+ if ($other->{$_}->{TYPE} eq "LIBRARY") {
+ s/^LIB//g;
+ $_ = lc($_);
- s/^LIB//g;
- $_ = lc($_);
+ $pubs .= "$_ ";
+ } else {
+ s/^LIB//g;
+ $_ = lc($_);
- $pubs .= "$_ ";
+ $privlibs .= "-l$_ ";
+ }
}
}
if (defined($ctx->{PRIVATE_DEPENDENCIES})) {
foreach (@{$ctx->{PRIVATE_DEPENDENCIES}}) {
+ next if ($other->{$_}->{ENABLE} eq "NO");
if ($other->{$_}->{TYPE} eq "LIBRARY") {
s/^LIB//g;
$_ = lc($_);