diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
| commit | b4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch) | |
| tree | 138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/build/smb_build/dot.pl | |
| parent | 1131d4c2545355ef793e468810655c0f72828368 (diff) | |
| parent | b136033421eb045b28f5928e4d2f9604cf704690 (diff) | |
| download | samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2 samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/build/smb_build/dot.pl')
| -rwxr-xr-x | source4/build/smb_build/dot.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/smb_build/dot.pl b/source4/build/smb_build/dot.pl index 82f89c081a..e50ee50f95 100755 --- a/source4/build/smb_build/dot.pl +++ b/source4/build/smb_build/dot.pl @@ -44,7 +44,7 @@ my $name = "samba4"; my $only; if (defined($subsys)) { my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, - "STATIC_LIBRARY", "SHARED_LIBRARY", "SHARED_LIBRARY"); + "MERGED_OBJ", "SHARED_LIBRARY", "SHARED_LIBRARY"); die("No such subsystem $subsys") unless (defined($DEPEND->{$subsys})); |