From 3ad2bf2fa17805d0655e646591bab72d98a71c5e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 23 Dec 2004 21:48:32 +0000
Subject: [PATCH] r4349: Start to fix the long-standing pain that --with-krb5
 would be ignored if krb5-config was in the path.

I'll merge this to Samba3, before trying to merge all of the Samba3
changes to Samba4.

Andrew Bartlett
(This used to be commit 906ba7cb8af02d44c868805e0b108b966f3221af)
---
 source4/libads/config.m4 | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index d9488f1401a..a696c54e020 100644
--- a/source4/libads/config.m4
+++ b/source4/libads/config.m4
@@ -130,8 +130,8 @@ if test x$with_krb5_support != x"no"; then
 
 	#################################################
 	# check for krb5-config from recent MIT and Heimdal kerberos 5
-	AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-	AC_MSG_CHECKING(for working krb5-config)
+	AC_PATH_PROG(KRB5_CONFIG, $krb5_withval/krb5-config)
+	AC_MSG_CHECKING(for working $krb5_withval/krb5-config)
 	if test -x "$KRB5_CONFIG"; then
 		ac_save_CFLAGS=$CFLAGS
 		CFLAGS="";export CFLAGS
@@ -145,7 +145,29 @@ if test x$with_krb5_support != x"no"; then
 		FOUND_KRB5=yes
 		AC_MSG_RESULT(yes)
 	else
-		AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
+		AC_MSG_RESULT(no. Fallback to finding krb5-config in path)
+	fi
+
+	if test x$FOUND_KRB5 != x"yes"; then
+		#################################################
+		# check for krb5-config from recent MIT and Heimdal kerberos 5
+		AC_PATH_PROG(KRB5_CONFIG, krb5-config)
+		AC_MSG_CHECKING(for working krb5-config)
+		if test -x "$KRB5_CONFIG"; then
+			ac_save_CFLAGS=$CFLAGS
+			CFLAGS="";export CFLAGS
+			ac_save_LDFLAGS=$LDFLAGS
+			LDFLAGS="";export LDFLAGS
+			KRB5_LIBS="`$KRB5_CONFIG --libs gssapi`"
+			KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
+			KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
+			CFLAGS=$ac_save_CFLAGS;export CFLAGS
+			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
+			FOUND_KRB5=yes
+			AC_MSG_RESULT(yes)
+		else
+			AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
+		fi
 	fi
   
 	if test x$FOUND_KRB5 != x"yes"; then
-- 
2.11.4.GIT