r4923: Avoid using krb5-config in the path if a krb5 prefix was already set.

Andrew Bartlett

diff --git a/source/libads/config.m4 b/source/libads/config.m4
index 2d78b72d392a6bbb2cd0fb7e253ab55bf2182d74..14d870474766f5e35840911f82a4068f2c2937cb 100644 (file)
--- a/source/libads/config.m4
+++ b/source/libads/config.m4
@@ -96,6 +96,7 @@ with_krb5_support=auto
 krb5_withval=auto
 AC_MSG_CHECKING([for KRB5 support])
 
+KRB5_CONFIG=""
 # Do no harm to the values of CFLAGS and LIBS while testing for
 # Kerberos support.
 AC_ARG_WITH(krb5,
@@ -120,6 +121,7 @@ AC_ARG_WITH(krb5,
                        with_krb5_support=yes
                        AC_MSG_RESULT(yes)
                        krb5_withval=$withval
+                       KRB5_CONFIG="$krb5_withval/bin/krb5-config"
                        ;;
        esac ],
        AC_MSG_RESULT($with_krb5_support)
@@ -130,29 +132,29 @@ if test x$with_krb5_support != x"no"; then
 
        #################################################
        # check for krb5-config from recent MIT and Heimdal kerberos 5
-       KRB5_CONFIG="$krb5_withval/bin/krb5-config"
-       AC_MSG_CHECKING(for working $krb5_withval/bin/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)
+       AC_MSG_CHECKING(for working specified location for krb5-config)
+       if test x$KRB5_CONFIG != "x"; then
+               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. Found $KRB5_CONFIG)
+               else 
+                       AC_MSG_RESULT(no. Fallback to specified directory)
+               fi
        else
                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)
+               AC_MSG_CHECKING(for working krb5-config in path)
                if test -x "$KRB5_CONFIG"; then
                        ac_save_CFLAGS=$CFLAGS
                        CFLAGS="";export CFLAGS
@@ -164,7 +166,7 @@ if test x$with_krb5_support != x"no"; then
                        CFLAGS=$ac_save_CFLAGS;export CFLAGS
                        LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
                        FOUND_KRB5=yes
-                       AC_MSG_RESULT(yes)
+                       AC_MSG_RESULT(yes. Found $KRB5_CONFIG)
                else
                        AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
                fi