------------------------------------------------------------
revno: 14013
revision-id: squid3@treenet.co.nz-20160330113827-rx8t2a8xr2btyxii
parent: squid3@treenet.co.nz-20160329164416-lc7j9l9fb2xeytig
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4409
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2016-03-31 00:38:27 +1300
message:
  Bug 4409 pt2: Fix krb5-config Heimdal detection
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160330113827-rx8t2a8xr2btyxii
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: c9d95b0d25dd5cef2348b864669b597fe8a7a069
# timestamp: 2016-03-30 11:50:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160329164416-\
#   lc7j9l9fb2xeytig
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2016-03-23 14:48:36 +0000
+++ configure.ac	2016-03-30 11:38:27 +0000
@@ -1649,7 +1649,7 @@
     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