diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-06 14:03:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:54 -0500 |
| commit | 66c17f778ac65d1b37a6c13187d52bb8dad005de (patch) | |
| tree | 1f11ae18103c7648a326f78b941758699af51da7 /source4/build/smb_build/main.pl | |
| parent | 8f89522a3fdb5160f7dc5748b8c10ca39c22d775 (diff) | |
| download | samba-66c17f778ac65d1b37a6c13187d52bb8dad005de.tar.gz samba-66c17f778ac65d1b37a6c13187d52bb8dad005de.tar.bz2 samba-66c17f778ac65d1b37a6c13187d52bb8dad005de.zip | |
r19571: Add a USESHARED parameter (different from BLDSHARED) + two small
shared-library related fixes.
(This used to be commit 8c7276b6c6ccebfbc60de978fcb2c23e7fbc12b5)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 8 |
1 files changed, 2 insertions, 6 deletions
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"; |