summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-06-18 02:32:26 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-06-18 02:32:26 +0200
commit4e293e37803d63fc3fc9094f3a2b84758cad5c09 (patch)
tree7b9c27b7114bb1dfeb37af50a20efa09911740bd
parent4657f52c06c947d57f01722cb140b55306fa94d3 (diff)
downloadsamba-4e293e37803d63fc3fc9094f3a2b84758cad5c09.tar.gz
samba-4e293e37803d63fc3fc9094f3a2b84758cad5c09.tar.bz2
samba-4e293e37803d63fc3fc9094f3a2b84758cad5c09.zip
smb_build: Always build modules for system-libraries as shared libraries,
since they can't be included in the static library.
-rw-r--r--source4/build/smb_build/input.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index df9a525f4f..27a00890b4 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -93,9 +93,10 @@ sub check_module($$$)
unless (defined($mod->{INIT_FUNCTION_SENTINEL})) { $mod->{INIT_FUNCTION_SENTINEL} = "NULL"; }
if (not defined($mod->{OUTPUT_TYPE})) {
- if ((not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) or
+ if ((not defined($INPUT->{$mod->{SUBSYSTEM}})) or
+ (not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) or
$INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
- $mod->{OUTPUT_TYPE} = undef;
+ $mod->{OUTPUT_TYPE} = ["SHARED_LIBRARY"];
} else {
$mod->{OUTPUT_TYPE} = $default_ot;
}