From 66c17f778ac65d1b37a6c13187d52bb8dad005de Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 6 Nov 2006 14:03:51 +0000 Subject: r19571: Add a USESHARED parameter (different from BLDSHARED) + two small shared-library related fixes. (This used to be commit 8c7276b6c6ccebfbc60de978fcb2c23e7fbc12b5) --- source4/build/smb_build/main.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source4/build') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 908222d504..3e546d58ae 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -20,18 +20,14 @@ my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk"); my $library_output_type; -if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { - $library_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; -} elsif ($config::config{BLDSHARED} eq "true") { +if ($config::config{USESHARED} eq "true") { $library_output_type = "SHARED_LIBRARY"; } else { $library_output_type = "STATIC_LIBRARY"; } my $module_output_type; -if (defined($ENV{"MODULE_OUTPUT_TYPE"})) { - $module_output_type = $ENV{MODULE_OUTPUT_TYPE}; -} elsif ($config::config{BLDSHARED} eq "true") { +if ($config::config{USESHARED} eq "true") { $module_output_type = "SHARED_LIBRARY"; } else { $module_output_type = "INTEGRATED"; -- cgit