sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

build: Allow manually written pkg-config files.

Browse Source 
(This used to be commit 8104907c5222ee72d78272ab81583d25c3132d0d)
This commit is contained in:
Jelmer Vernooij 2008-01-22 18:21:48 +01:00
parent a6a8720025
commit b49e2f1f35
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/build/smb_build/config_mk.pm
View File

@ -91,6 +91,7 @@ my $section_types = {
"LIBRARY_REALNAME" => "string", "LIBRARY_REALNAME" => "string",
"PC_NAME" => "string", "PC_NAME" => "string",
"PC_FILE" => "string",
"INIT_FUNCTION_TYPE" => "string", "INIT_FUNCTION_TYPE" => "string",
"INIT_FUNCTION_SENTINEL" => "string", "INIT_FUNCTION_SENTINEL" => "string",

8
source4/build/smb_build/main.pl
View File

@ -60,8 +60,12 @@ foreach my $key (values %$OUTPUT) {
next unless defined $key->{OUTPUT_TYPE}; next unless defined $key->{OUTPUT_TYPE};
$mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" if (defined($key->{PC_FILE})) {
and defined($key->{VERSION}); 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 $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
if ($key->{TYPE} eq "LIBRARY" and if ($key->{TYPE} eq "LIBRARY" and