diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-01-02 00:16:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:35 -0500 |
| commit | bc4aebfaecf52678eb40aee2fd4bd81a315c554d (patch) | |
| tree | db09ef34f7adc46c9fd6a1398bc225eac0b85917 /source4/build/smb_build/input.pm | |
| parent | 55eaed5aa2c1c4a6c417278ca08652f12fb9e7b9 (diff) | |
| download | samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.gz samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.bz2 samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.zip | |
r12670: Make a couple of dependencies stricter
Re-introduce and use the OUTPUT_TYPE property for MODULEs to force
specific modules to always be included
(This used to be commit f9eede3d40098eddc3618ee48f9253cdddb94a6f)
Diffstat (limited to 'source4/build/smb_build/input.pm')
| -rw-r--r-- | source4/build/smb_build/input.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index ceddd75c3f..ef90e3c122 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -69,12 +69,12 @@ sub check_module($$$) if (defined($mod->{CHOSEN_BUILD}) and $mod->{CHOSEN_BUILD} ne "DEFAULT") { $mod->{OUTPUT_TYPE} = $mod->{CHOSEN_BUILD}; - } else { + } elsif (not defined($mod->{OUTPUT_TYPE})) { $mod->{OUTPUT_TYPE} = $default_ot; } if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") { - $mod->{INSTALLDIR} = "LIBDIR/$mod->{SUBSYSTEM}"; + $mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}"; push (@{$mod->{REQUIRED_SUBSYSTEMS}}, $mod->{SUBSYSTEM}); } else { push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME}); |