diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-28 01:55:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:08 -0500 |
| commit | bc141c795767cc765731c607f1fb047811da6e03 (patch) | |
| tree | ecfc5163d2e58a679240fded98b9d08ab6134328 /source4/build/smb_build/input.pm | |
| parent | 4818967242c7f502661193428f6217e8caa43e20 (diff) | |
| download | samba-bc141c795767cc765731c607f1fb047811da6e03.tar.gz samba-bc141c795767cc765731c607f1fb047811da6e03.tar.bz2 samba-bc141c795767cc765731c607f1fb047811da6e03.zip | |
r15304: Fix smbd build, more updates on getting --enable-dso to build again
(This used to be commit 3ef9326386ba1c210166302cbcf02d2ed3f19944)
Diffstat (limited to 'source4/build/smb_build/input.pm')
| -rw-r--r-- | source4/build/smb_build/input.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 3084381661..8f7e5e4838 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -71,8 +71,6 @@ sub check_module($$$) if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") { $mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}"; - push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM}) unless - $INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "BINARY"; } else { push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION}); } @@ -114,7 +112,6 @@ sub check_binary($$) $bin->{OUTPUT_TYPE} = "BINARY"; } - sub import_integrated($$) { my ($lib, $depend) = @_; @@ -200,6 +197,7 @@ sub check($$$$$) foreach my $k (keys %$INPUT) { my $part = $INPUT->{$k}; + $part->{LINK_FLAGS} = []; $part->{FULL_OBJ_LIST} = ["\$($part->{TYPE}_$part->{NAME}_OBJ_LIST)"]; check_subsystem($INPUT, $part, $subsys_ot) if ($part->{TYPE} eq "SUBSYSTEM"); @@ -209,6 +207,9 @@ sub check($$$$$) } foreach my $part (values %$INPUT) { + if (defined($part->{INIT_FUNCTIONS})) { + push (@{$part->{LINK_FLAGS}}, "\$(DYNEXP)"); + } import_integrated($part, $INPUT); } |