summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-22 18:21:48 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-22 18:21:48 +0100
commitb49e2f1f35e6b5a8ab7e992d5609070ddf0875b2 (patch)
tree81d6fa92812c857829208d58098f43ccb04b22b7
parenta6a87200250ff9c76138da71a65f025da92d070e (diff)
downloadsamba-b49e2f1f35e6b5a8ab7e992d5609070ddf0875b2.tar.gz
samba-b49e2f1f35e6b5a8ab7e992d5609070ddf0875b2.tar.bz2
samba-b49e2f1f35e6b5a8ab7e992d5609070ddf0875b2.zip
build: Allow manually written pkg-config files.
(This used to be commit 8104907c5222ee72d78272ab81583d25c3132d0d)
-rw-r--r--source4/build/smb_build/config_mk.pm1
-rw-r--r--source4/build/smb_build/main.pl8
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index d07660ba1d..fa3949db2e 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -91,6 +91,7 @@ my $section_types = {
"LIBRARY_REALNAME" => "string",
"PC_NAME" => "string",
+ "PC_FILE" => "string",
"INIT_FUNCTION_TYPE" => "string",
"INIT_FUNCTION_SENTINEL" => "string",
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