diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-28 01:55:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:08 -0500 |
| commit | bc141c795767cc765731c607f1fb047811da6e03 (patch) | |
| tree | ecfc5163d2e58a679240fded98b9d08ab6134328 /source4/build/smb_build/main.pl | |
| parent | 4818967242c7f502661193428f6217e8caa43e20 (diff) | |
| download | samba-bc141c795767cc765731c607f1fb047811da6e03.tar.gz samba-bc141c795767cc765731c607f1fb047811da6e03.tar.bz2 samba-bc141c795767cc765731c607f1fb047811da6e03.zip | |
r15304: Fix smbd build, more updates on getting --enable-dso to build again
(This used to be commit 3ef9326386ba1c210166302cbcf02d2ed3f19944)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 61c9214086..d89be4bebf 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -19,14 +19,6 @@ use strict; my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk"); -my $subsystem_output_type; - -if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) { - $subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}; -} else { - $subsystem_output_type = "STATIC_LIBRARY"; -} - my $library_output_type; if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { $library_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; @@ -46,9 +38,9 @@ if (defined($ENV{"MODULE_OUTPUT_TYPE"})) { } my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, - $subsystem_output_type, $library_output_type, $module_output_type); + "STATIC_LIBRARY", $library_output_type, $module_output_type); my $OUTPUT = output::create_output($DEPEND, \%config::config); -$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsystem_output_type; +$config::config{SUBSYSTEM_OUTPUT_TYPE} = "STATIC_LIBRARY"; $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); |