diff options
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 15 |
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($_); |