From 29a8069aee510c9dcc1a216a52cc53639621caf9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 17 May 2005 00:02:55 +0000
Subject: r6838: Remove unnecessary calls to gensec_gsskrb5 Make the build
 system give a proper warning about this in the future (This used to be commit
 2d980465af87d25ce17b8340c6b5f662ef29edd3)

---
 source4/build/smb_build/input.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 3876469fc4..8f0509692c 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -54,7 +54,9 @@ sub check_subsystem($$)
 		return;
 	}
 	
-	$subsys->{OUTPUT_TYPE} = $subsystem_output_type;
+	unless(defined($subsys->{OUTPUT_TYPE})) {
+		$subsys->{OUTPUT_TYPE} = $subsystem_output_type;
+	}
 }
 
 sub check_module($$)
@@ -173,7 +175,12 @@ sub check($)
 		($part->{ENABLE} = "YES") if not defined($part->{ENABLE});
 	}
 
-	foreach my $part (values %{$CTX->{INPUT}}) {
+	foreach my $k (keys %{$CTX->{INPUT}}) {
+		my $part = $CTX->{INPUT}->{$k};
+		if (not defined($part->{TYPE})) {
+			print STDERR "$k does not have a type set.. Perhaps it's only mentioned in a .m4 but not in a .mk file?\n";
+			next;
+		}
 		check_subsystem($CTX, $part) if ($part->{TYPE} eq "SUBSYSTEM");
 		check_module($CTX, $part) if ($part->{TYPE} eq "MODULE");
 		check_library($CTX, $part) if ($part->{TYPE} eq "LIBRARY");
-- 
cgit