svn commit: samba r26414 - in branches/SAMBA_4_0/source/build/smb_build: .

[metze at samba.org]

Author: metze
Date: 2007-12-12 10:18:32 +0000 (Wed, 12 Dec 2007)
New Revision: 26414

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26414

Log:
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
Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-12-12 10:13:08 UTC (rev 26413)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-12-12 10:18:32 UTC (rev 26414)
@@ -567,7 +567,16 @@
 	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 @@
 	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($_);