Prevent adding libreplace when not necessary.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 16 Feb 2008 20:16:28 +0000 (21:16 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 16 Feb 2008 20:16:28 +0000 (21:16 +0100)
(This used to be commit 978eb6f1616122e13429b00268d03942afc41425)

source4/build/smb_build/input.pm

index 825b033fb9ab09047941e08637a4ea8c79a10e32..ed584e185c846d9bf2f9688ea884f88e0336b27b 100644 (file)
@@ -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($$$)