summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-12-12 10:18:32 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:45 +0100
commit1261f0e0e4199c865313c2980334d420b750b100 (patch)
tree3702da0b2da9f7478df16521866cb0aabcf2d968
parent5bddcf45f30e1a30511141e86232c7378073f629 (diff)
downloadsamba-1261f0e0e4199c865313c2980334d420b750b100.tar.gz
samba-1261f0e0e4199c865313c2980334d420b750b100.tar.bz2
samba-1261f0e0e4199c865313c2980334d420b750b100.zip
r26414: build: bring in the content of EXT_LIB's for the .pc files
TODO: we need to check if we need to recursivly expand the dependencies as we do for the Makefile rules metze (This used to be commit 5cc9673778838e42999363f75220cc882098d282)
-rw-r--r--source4/build/smb_build/makefile.pm22
1 files changed, 20 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 3b43dfb0b7..804a728457 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -567,7 +567,16 @@ sub PkgConfig($$$)
if (defined($ctx->{PUBLIC_DEPENDENCIES})) {
foreach (@{$ctx->{PUBLIC_DEPENDENCIES}}) {
next if ($other->{$_}->{ENABLE} eq "NO");
- if ($other->{$_}->{TYPE} eq "LIBRARY") {
+ if ($other->{$_}->{TYPE} eq "EXT_LIB") {
+ my $e = $other->{$_};
+
+ my $ldflags = join(" ", @{$e->{LDFLAGS}});
+ $ldflags .= " " unless $ldflags eq "";
+ my $libs = join(" ", @{$e->{LIBS}});
+ $libs .= " " unless $libs eq "";
+
+ $pubs .= $ldflags.$libs;
+ } elsif ($other->{$_}->{TYPE} eq "LIBRARY") {
s/^LIB//g;
$_ = lc($_);
@@ -584,7 +593,16 @@ sub PkgConfig($$$)
if (defined($ctx->{PRIVATE_DEPENDENCIES})) {
foreach (@{$ctx->{PRIVATE_DEPENDENCIES}}) {
next if ($other->{$_}->{ENABLE} eq "NO");
- if ($other->{$_}->{TYPE} eq "LIBRARY") {
+ if ($other->{$_}->{TYPE} eq "EXT_LIB") {
+ my $e = $other->{$_};
+
+ my $ldflags = join(" ", @{$e->{LDFLAGS}});
+ $ldflags .= " " unless $ldflags eq "";
+ my $libs = join(" ", @{$e->{LIBS}});
+ $libs .= " " unless $libs eq "";
+
+ $privlibs .= $ldflags.$libs;
+ } elsif ($other->{$_}->{TYPE} eq "LIBRARY") {
s/^LIB//g;
$_ = lc($_);