r20825: control the subsystem default output type via a variable too

metze
(This used to be commit 624bd4e5a8ef1b7902ce8df6e8885cd8224a3037)

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 841464d03b969c9b4e088609fc4db64736ec5826..765944cae1904c7c70855f90a56ff4d274e8902a 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -19,6 +19,9 @@ use strict;
 my $INPUT = {};
 my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
 
+my $subsys_output_type;
+$subsys_output_type = ["STATIC_LIBRARY"];
+
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {
        $library_output_type = ["SHARED_LIBRARY", "STATIC_LIBRARY"];
@@ -35,10 +38,12 @@ if ($config::config{USESHARED} eq "true") {
        $module_output_type = ["INTEGRATED"];
 }
 
-my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, 
-       ["STATIC_LIBRARY"], $library_output_type, $module_output_type);
+my $DEPEND = smb_build::input::check($INPUT, \%config::enabled,
+                                    $subsys_output_type,
+                                    $library_output_type,
+                                    $module_output_type);
 my $OUTPUT = output::create_output($DEPEND, \%config::config);
-$config::config{SUBSYSTEM_OUTPUT_TYPE} = ["STATIC_LIBRARY"];
+$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsys_output_type;
 $config::config{LIBRARY_OUTPUT_TYPE} = $library_output_type;
 $config::config{MODULE_OUTPUT_TYPE} = $module_output_type;
 my $mkenv = new smb_build::makefile(\%config::config, $mkfile);