diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 21:16:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 21:16:28 +0100 |
| commit | 0419da69d5a8ab606a49598692c050447e306663 (patch) | |
| tree | d2ce80ca0fcfa7527ccbc2f1831f7da79367880a | |
| parent | fe5b7c4986b54985880fa8bc38248dab1cc5e9b0 (diff) | |
| download | samba-0419da69d5a8ab606a49598692c050447e306663.tar.gz samba-0419da69d5a8ab606a49598692c050447e306663.tar.bz2 samba-0419da69d5a8ab606a49598692c050447e306663.zip | |
Prevent adding libreplace when not necessary.
(This used to be commit 978eb6f1616122e13429b00268d03942afc41425)
| -rw-r--r-- | source4/build/smb_build/input.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 825b033fb9..ed584e185c 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -66,8 +66,6 @@ sub check_subsystem($$$) unless (defined($subsys->{INIT_FUNCTION_TYPE})) { $subsys->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; } unless (defined($subsys->{INIT_FUNCTION_SENTINEL})) { $subsys->{INIT_FUNCTION_SENTINEL} = "NULL"; } - - add_libreplace($subsys); } sub check_module($$$) @@ -111,11 +109,11 @@ sub check_module($$$) $sane_subsystem =~ s/^lib//; $mod->{INSTALLDIR} = "MODULESDIR/$sane_subsystem"; push (@{$mod->{PUBLIC_DEPENDENCIES}}, $mod->{SUBSYSTEM}); + add_libreplace($mod); } if (grep(/INTEGRATED/, @{$mod->{OUTPUT_TYPE}})) { push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION}); } - add_libreplace($mod); } sub check_library($$$) |