build: Allow manually written pkg-config files.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 22 Jan 2008 17:21:48 +0000 (18:21 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Jan 2008 17:21:48 +0000 (18:21 +0100)
source/build/smb_build/config_mk.pm
source/build/smb_build/main.pl

index d07660ba1d826365c39a06f8bd3b7e9bdbc26a76..fa3949db2e65539fc6e4889316a5e23ec252f8d2 100644 (file)
@@ -91,6 +91,7 @@ my $section_types = {
                "LIBRARY_REALNAME" => "string",
 
                "PC_NAME" => "string",
+               "PC_FILE" => "string",
                
                "INIT_FUNCTION_TYPE"    => "string",
                "INIT_FUNCTION_SENTINEL" => "string",
index e084d48a77b8da8a385b5da3395b6e5eed1e53ba..cdeaeeb1c8c6b46240f0e83954a71a8b35029304 100644 (file)
@@ -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