diff options
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/config.m4 | 2 | ||||
| -rw-r--r-- | source4/auth/gensec/config.mk | 5 | ||||
| -rw-r--r-- | source4/auth/kerberos/config.m4 | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source4/auth/gensec/config.m4 b/source4/auth/gensec/config.m4 index 4565ce0b97..af17e896a4 100644 --- a/source4/auth/gensec/config.m4 +++ b/source4/auth/gensec/config.m4 @@ -1,7 +1,7 @@ SMB_MODULE_DEFAULT(gensec_krb5, NOT) SMB_MODULE_DEFAULT(gensec_gssapi, NOT) -if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then +if test x"$HAVE_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) diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index f8d1928585..34587e2e45 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -14,8 +14,7 @@ REQUIRED_SUBSYSTEMS = \ SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_krb5_init INIT_OBJ_FILES = auth/gensec/gensec_krb5.o -REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS EXT_LIB_KRB5 AUTH - +REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS KERBEROS_LIB AUTH # End MODULE gensec_krb5 ################################################ @@ -25,7 +24,7 @@ REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS EXT_LIB_KRB5 AUTH SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_gssapi_init INIT_OBJ_FILES = auth/gensec/gensec_gssapi.o -REQUIRED_SUBSYSTEMS = EXT_LIB_KRB5 AUTH +REQUIRED_SUBSYSTEMS = KERBEROS_LIB AUTH # End MODULE gensec_gssapi ################################################ diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4 index d88fc78554..bbb57bdd47 100644 --- a/source4/auth/kerberos/config.m4 +++ b/source4/auth/kerberos/config.m4 @@ -1,3 +1,5 @@ +# NOTE! this whole m4 file is disabled in configure.in for now + ################################################# # KRB5 support KRB5_CFLAGS="" |