From b49e2f1f35e6b5a8ab7e992d5609070ddf0875b2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 22 Jan 2008 18:21:48 +0100 Subject: build: Allow manually written pkg-config files. (This used to be commit 8104907c5222ee72d78272ab81583d25c3132d0d) --- source4/build/smb_build/main.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index e084d48a77..cdeaeeb1c8 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -60,8 +60,12 @@ 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->{PC_FILE}); + } else { + $mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" + and defined($key->{VERSION}); + } $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and -- cgit From 907ec5ba7bac2b5431a14f02f0dc1f5e126366e2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 22 Jan 2008 18:47:18 +0100 Subject: build: remove support for automatically building .pc files. (This used to be commit e9f99732677f46d599c270cfcb5042c11d34d338) --- source4/build/smb_build/main.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index cdeaeeb1c8..fb769103d0 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -61,10 +61,7 @@ foreach my $key (values %$OUTPUT) { $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if (defined($key->{PC_FILE})) { - push(@{$mkenv->{pc_files}}, $key->{PC_FILE}); - } else { - $mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" - and defined($key->{VERSION}); + push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}"); } $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); -- cgit