From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 30 Mar 2016 11:38:27 +0000 (+1300)
Subject: Bug 4409 pt2: Fix krb5-config Heimdal detection
X-Git-Tag: SQUID_3_5_16~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd6b1add9f32cbba5fa9c6497424e37374de6de2;p=thirdparty%2Fsquid.git

Bug 4409 pt2: Fix krb5-config Heimdal detection
---

diff --git a/configure.ac b/configure.ac
index 77ffa4c072..3be0ece459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,7 +1649,7 @@ if test "x$with_heimdal_krb5" != "xno" -a "x$KRB5LIBS" = "x"; then
     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`"
-      if test "x$with_heimdal_krb5" = "xyes"; then
+      if test "x$with_heimdal_krb5" = "xyes" -a $ac_heimdal = 0; then
         AC_MSG_ERROR([Could not find pkg-config or krb5-config for Heimdal Kerberos])
       fi
     else