From 3acad382e134514c190e79efc8586d51813773ad Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Tue, 1 Sep 2009 08:26:00 +0000
Subject: [PATCH]  - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to
 search the path for    krb5-config if it's not in the location specified by
 --with-kerberos5.    Patch from jchadima at redhat.

---
 ChangeLog    | 5 +++++
 configure.ac | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b0f964a..b692efad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+   krb5-config if it's not in the location specified by --with-kerberos5.
+   Patch from jchadima at redhat.
+
 20090829
  - (dtucker) [README.platform] Add text about development packages, based on
    text from Chris Pepper in bug #1631.
diff --git a/configure.ac b/configure.ac
index 4bb78472..f68e00a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3404,10 +3404,10 @@ AC_ARG_WITH(kerberos5,
 		AC_DEFINE(KRB5, 1, [Define if you want Kerberos 5 support])
 		KRB5_MSG="yes"
 
-		AC_MSG_CHECKING(for krb5-config)
-		if test -x  $KRB5ROOT/bin/krb5-config ; then
-			KRB5CONF=$KRB5ROOT/bin/krb5-config
-			AC_MSG_RESULT($KRB5CONF)
+		AC_PATH_PROG([KRB5CONF],[krb5-config],
+			     [$KRB5ROOT/bin/krb5-config],
+			     [$KRB5ROOT/bin:$PATH])
+		if test -x $KRB5CONF ; then
 
 			AC_MSG_CHECKING(for gssapi support)
 			if $KRB5CONF | grep gssapi >/dev/null ; then
@@ -3433,7 +3433,6 @@ AC_ARG_WITH(kerberos5,
 				         AC_MSG_RESULT(no)
 			)
 		else
-			AC_MSG_RESULT(no)
 			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
 			LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
 			AC_MSG_CHECKING(whether we are using Heimdal)
-- 
2.45.1