r6810: Rename auth/{ntlmssp,gensec,kerberos} mk and m4 files to be called

config.mk and config.m4 to be consistent with the rest of Samba.

diff --git a/source/auth/gensec/gensec.m4 b/source/auth/gensec/config.m4
similarity index 65%
rename from source/auth/gensec/gensec.m4
rename to source/auth/gensec/config.m4
index 4565ce0b97157926ab2f8abe285da7049ca6834c..1af0a1d9c8971752d54c8cbef263aa86a082a5d8 100644 (file)
--- a/source/auth/gensec/gensec.m4
+++ b/source/auth/gensec/config.m4
@@ -1,8 +1,12 @@
 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/source/auth/gensec/gensec.mk b/source/auth/gensec/config.mk
similarity index 100%
rename from source/auth/gensec/gensec.mk
rename to source/auth/gensec/config.mk

diff --git a/source/auth/kerberos/kerberos.m4 b/source/auth/kerberos/config.m4
similarity index 99%
rename from source/auth/kerberos/kerberos.m4
rename to source/auth/kerberos/config.m4
index 6bfe486dd62f43c3c2ed89a3a9efabc116bc2e61..b78f96a877ed2f452a514bcf5e64e0690c6e9c76 100644 (file)
--- a/source/auth/kerberos/kerberos.m4
+++ b/source/auth/kerberos/config.m4
@@ -491,3 +491,4 @@ if test x"$with_krb5_support" != x"no"; then
 fi
 
 SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}])
+

diff --git a/source/auth/kerberos/kerberos.mk b/source/auth/kerberos/config.mk
similarity index 100%
rename from source/auth/kerberos/kerberos.mk
rename to source/auth/kerberos/config.mk

diff --git a/source/auth/ntlmssp/ntlmssp.mk b/source/auth/ntlmssp/config.mk
similarity index 100%
rename from source/auth/ntlmssp/ntlmssp.mk
rename to source/auth/ntlmssp/config.mk

diff --git a/source/build/smb_build/main.pm b/source/build/smb_build/main.pm
index 8057fa20957b8ef037a7ca9f528de2acbdf142eb..a1943f581a14038f907a0db88da868d9d9b6c988 100644 (file)
--- a/source/build/smb_build/main.pm
+++ b/source/build/smb_build/main.pm
@@ -46,9 +46,9 @@ sub smb_build_main($)
                "winbind/config.mk",
                "nbt_server/config.mk",
                "cldap_server/config.mk",
-               "auth/gensec/gensec.mk",
-               "auth/kerberos/kerberos.mk",
-               "auth/ntlmssp/ntlmssp.mk",
+               "auth/gensec/config.mk",
+               "auth/kerberos/config.mk",
+               "auth/ntlmssp/config.mk",
                "libcli/auth/config.mk",
                "libcli/ldap/config.mk",
                "libcli/config.mk",

diff --git a/source/configure.in b/source/configure.in
index 9186d225c38764f5b09378746699bb86d668b417..0aff3be8c5b8d3de1d7dca4f087c91f4c51c7cb2 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -20,8 +20,8 @@ SMB_INCLUDE_M4(lib/ldb/config.m4)
 SMB_INCLUDE_M4(lib/events/config.m4)
 SMB_INCLUDE_M4(lib/cmdline/config.m4)
 SMB_INCLUDE_M4(param/config.m4)
-SMB_INCLUDE_M4(auth/kerberos/kerberos.m4)
-SMB_INCLUDE_M4(auth/gensec/gensec.m4)
+SMB_INCLUDE_M4(auth/kerberos/config.m4)
+SMB_INCLUDE_M4(auth/gensec/config.m4)
 SMB_INCLUDE_M4(libcli/config.m4)
 SMB_INCLUDE_M4(smbd/process_model.m4)
 SMB_INCLUDE_M4(lib/registry/config.m4)