summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-06-17 12:45:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:22 -0500
commit949deaf9e3814e7a4dfe0c5bbf9982ed9826a630 (patch)
tree78c281e16662044c7afb057cdfa78e5068911114
parent88fc8f243fcda6fd3ced72487ab8bf33ee153895 (diff)
downloadsamba-949deaf9e3814e7a4dfe0c5bbf9982ed9826a630.tar.gz
samba-949deaf9e3814e7a4dfe0c5bbf9982ed9826a630.tar.bz2
samba-949deaf9e3814e7a4dfe0c5bbf9982ed9826a630.zip
r7687: Some more tests that must be done only when krb5_config is absent.
Andrew Bartlett (This used to be commit 898f72d19654c68ba68d36a099bf4dbed5d09fe9)
-rw-r--r--source4/auth/kerberos/config.m49
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4
index 07d4a7f457..672c630d29 100644
--- a/source4/auth/kerberos/config.m4
+++ b/source4/auth/kerberos/config.m4
@@ -199,14 +199,15 @@ if test x"$with_krb5_support" != x"no"; then
# different kerberos include paths
AC_CHECK_HEADERS(gssapi.h gssapi_krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h com_err.h)
- ##################################################################
- # we might need the k5crypto and com_err libraries on some systems
- AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
- AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
# Heimdal checks.
# But only if we didn't have a krb5-config to tell us this already
if test x"$FOUND_KRB5_VIA_CONFIG" != x"yes"; then
+ ##################################################################
+ # we might need the k5crypto and com_err libraries on some systems
+ AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
+ AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
+
AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)