From 847d090bb41faaf8db029c01f18b39a7b7c8e7fc Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 13 Apr 2019 08:46:49 +0000 Subject: [PATCH] Check user-provided PATH for krb5-config (#390) When MIT or Heimdal Keberos libraries are installed at a custom location there may be several krb5-config installed. The one located at the user-provided path (if any) needs to have preference. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 72485d2016..16a9cb080f 100644 --- a/configure.ac +++ b/configure.ac @@ -1442,7 +1442,7 @@ if test "x$with_mit_krb5" != "xno"; then ]) if test "x$squid_pc_krb5_name" = "x" -a "$cross_compiling" = "no"; then # Look for krb5-config (unless cross-compiling) - AC_PATH_PROG(krb5_config,krb5-config,no) + AC_PATH_PROG(krb5_config,krb5-config,no,$krb5confpath) if test "x$ac_cv_path_krb5_config" != "xno" ; then krb5confpath="`dirname $ac_cv_path_krb5_config`" ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`" @@ -1675,7 +1675,7 @@ if test "x$with_heimdal_krb5" != "xno" -a "x$KRB5LIBS" = "x"; then fi if test "x$squid_pc_krb5_name" = "x" -a "$cross_compiling" = "no"; then # Look for krb5-config (unless cross-compiling) - AC_PATH_PROG(krb5_config,krb5-config,no) + AC_PATH_PROG(krb5_config,krb5-config,no,$krb5confpath) if test "x$ac_cv_path_krb5_config" != "xno" ; then krb5confpath="`dirname $ac_cv_path_krb5_config`" ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`" -- 2.47.2