summaryrefslogtreecommitdiffstats
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 19:06:17 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 19:06:17 +0100
commit602f4635da0935abffdda2a29ec302a775fdbe62 (patch)
tree9629af40ff9f530b43578d0e40f3e83a2be43cfc /source4/build
parent6e0522c3cae9c99b589db67727ee1256c6da82ef (diff)
downloadsamba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.gz
samba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.xz
samba-602f4635da0935abffdda2a29ec302a775fdbe62.zip
Get rid of 'INTEGRATED' build of modules - now replaced by 'MERGED_OBJ'
(This used to be commit 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/input.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 95902dfcbf6..9cc374fa796 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -73,11 +73,11 @@ sub check_module($$$)
}
if (!(defined($INPUT->{$mod->{SUBSYSTEM}}))) {
- $mod->{ENABLE} = "NO";
- return;
+ die("Unknown subsystem $mod->{SUBSYSTEM} for module $mod->{NAME}");
}
if ($INPUT->{$mod->{SUBSYSTEM}} eq "NO") {
+ warn("Disabling module $mod->{NAME} because subsystem $mod->{SUBSYSTEM} is disabled");
$mod->{ENABLE} = "NO";
return;
}