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

[jelmer at samba.org]

Author: jelmer
Date: 2006-11-24 17:05:04 +0000 (Fri, 24 Nov 2006)
New Revision: 19882

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

Log:
Fix static link flags in pkg-config files. Should allow running 
pidl tests on systems without shared libs.

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	2006-11-24 16:45:42 UTC (rev 19881)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-11-24 17:05:04 UTC (rev 19882)
@@ -415,17 +415,24 @@
 
 	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($_);