diff options
| -rw-r--r-- | source4/auth/gensec/config.m4 | 4 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source4/auth/gensec/config.m4 b/source4/auth/gensec/config.m4 index 1af0a1d9c8..4565ce0b97 100644 --- a/source4/auth/gensec/config.m4 +++ b/source4/auth/gensec/config.m4 @@ -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 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"); |