svn commit: samba r6838 - in branches/SAMBA_4_0/source: auth/gensec build/smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2005-05-17 00:02:55 +0000 (Tue, 17 May 2005)
New Revision: 6838

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6838

Log:
Remove unnecessary calls to gensec_gsskrb5
Make the build system give a proper warning about this in the future

Modified:
   branches/SAMBA_4_0/source/auth/gensec/config.m4
   branches/SAMBA_4_0/source/build/smb_build/input.pm


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/config.m4
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/config.m4	2005-05-16 23:43:38 UTC (rev 6837)
+++ branches/SAMBA_4_0/source/auth/gensec/config.m4	2005-05-17 00:02:55 UTC (rev 6838)
@@ -1,12 +1,8 @@
 SMB_MODULE_DEFAULT(gensec_krb5, NOT)
 SMB_MODULE_DEFAULT(gensec_gssapi, NOT)
-SMB_MODULE_DEFAULT(gensec_gsskrb5, NOT)
 
 if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then
 	# krb5 is now disabled at runtime, not build time
 	SMB_MODULE_DEFAULT(gensec_krb5, STATIC)
 	SMB_MODULE_DEFAULT(gensec_gssapi, STATIC)
-	if test x"$samba_cv_GSS_C_DCE_STYLE" = x"yes"; then
-		SMB_MODULE_DEFAULT(gensec_gsskrb5, STATIC)
-	fi
 fi

Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2005-05-16 23:43:38 UTC (rev 6837)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2005-05-17 00:02:55 UTC (rev 6838)
@@ -54,7 +54,9 @@
 		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 @@
 		($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");