------------------------------------------------------------
revno: 13960
revision-id: squid3@treenet.co.nz-20151218072323-m0awf6sqb0caeu9g
parent: squid3@treenet.co.nz-20151128142751-nyt0mkbtydmke1a4
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4387
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Fri 2015-12-18 20:23:23 +1300
message:
  Bug 4387: Kerberos build errors on Solaris
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20151218072323-m0awf6sqb0caeu9g
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 688b323d19ca2986f4907bde54d8312c2b17046c
# timestamp: 2015-12-18 07:50:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20151128142751-\
#   nyt0mkbtydmke1a4
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2015-11-28 14:27:51 +0000
+++ configure.ac	2015-12-18 07:23:23 +0000
@@ -1433,8 +1433,8 @@
   fi
 fi
 
-# detect MIT Kerberos or Apple Kerberos dependencies
-if test "x$with_mit_krb5" != "xno" || test "x$with_apple_krb5" = "xyes" ; then
+# detect MIT Kerberos dependencies (except on Solaris)
+if test "x$with_mit_krb5" != "xno" -a "x$with_solaris_krb5" != "xyes"; then
   SQUID_STATE_SAVE([squid_krb5_save])
   LIBS="$LIBS $LIB_KRB5_PATH"