svn commit: samba r5088 - in branches/SAMBA_4_0/source/libads: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-01-29 04:00:29 +0000 (Sat, 29 Jan 2005)
New Revision: 5088

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

Log:
Push some of the heimdal tests into a 'if we didn't have krb5-config' block.

This lets krb5-config handle this without us stuffing things up.
Add back the test tridge removed

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libads/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/libads/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libads/config.m4	2005-01-29 04:00:14 UTC (rev 5087)
+++ branches/SAMBA_4_0/source/libads/config.m4	2005-01-29 04:00:29 UTC (rev 5088)
@@ -128,6 +128,7 @@
 
 if test x$with_krb5_support != x"no"; then
 	FOUND_KRB5=no
+	FOUND_KRB5_VIA_CONFIG=no
 
 	#################################################
 	# check for krb5-config from recent MIT and Heimdal kerberos 5
@@ -144,6 +145,7 @@
 			CFLAGS=$ac_save_CFLAGS;export CFLAGS
 			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
 			FOUND_KRB5=yes
+			FOUND_KRB5_VIA_CONFIG=yes
 			AC_MSG_RESULT(yes. Found $KRB5CONFIG)
 		else 
 			AC_MSG_RESULT(no. Fallback to specified directory)
@@ -165,6 +167,7 @@
 			CFLAGS=$ac_save_CFLAGS;export CFLAGS
 			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
 			FOUND_KRB5=yes
+			FOUND_KRB5_VIA_CONFIG=yes
 			AC_MSG_RESULT(yes. Found $KRB5CONFIG)
 		else
 			AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
@@ -288,8 +291,12 @@
 	AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
 
 	# Heimdal checks.
-	AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
-	AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
+	# But only if we didn't have a krb5-config to tell us this already
+	if x"$FOUND_KRB5_VIA_CONFIG" != x"yes"; then
+		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)
+	fi
 
 	# Heimdal checks. On static Heimdal gssapi must be linked before krb5.
 	AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status,[],[],