diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-23 15:09:55 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-23 15:09:55 +1100 |
| commit | 56a611b12618ef0224a7a8a12883e0ab8340962d (patch) | |
| tree | d7bdef53981d1131bee032bfd7b1d68b597c6fe2 /source4/build/smb_build/main.pl | |
| parent | 2eab4abf25453a1849adb28d65869c16b2479f57 (diff) | |
| parent | 37325c4c1324d6b768bc8f4449a954550333e34d (diff) | |
| download | samba-56a611b12618ef0224a7a8a12883e0ab8340962d.tar.gz samba-56a611b12618ef0224a7a8a12883e0ab8340962d.tar.bz2 samba-56a611b12618ef0224a7a8a12883e0ab8340962d.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit f82eec69f1846aa46e4afe595d956cfd2256c335)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index e084d48a77..fb769103d0 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -60,8 +60,9 @@ foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); - $mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" - and defined($key->{VERSION}); + if (defined($key->{PC_FILE})) { + push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}"); + } $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and |