diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
| commit | c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (patch) | |
| tree | 8efaf6b885543a006a91294923324fc580d01bbf /source4/build/smb_build/main.pl | |
| parent | 11061499e182b9c41ec793d4eefb8a2cf7c88bfe (diff) | |
| parent | cab677a33f0376cd1bf96ec561dc0463bbf80edd (diff) | |
| download | samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.gz samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.bz2 samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
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 |