------------------------------------------------------------ revno: 13997 revision-id: squid3@treenet.co.nz-20160225193700-p3hrbf70baun550t parent: squid3@treenet.co.nz-20160223162456-99q21fmlid70u331 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4409 committer: Amos Jeffries branch nick: 3.5 timestamp: Fri 2016-02-26 08:37:00 +1300 message: Bug 4409: compile error when two Heimdal libraries are installed ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20160225193700-p3hrbf70baun550t # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: f629f1e65f701b2e350d8f2bb1f7f268598b4073 # timestamp: 2016-02-25 19:50:55 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160223162456-\ # 99q21fmlid70u331 # # Begin patch === modified file 'configure.ac' --- configure.ac 2016-02-23 16:24:56 +0000 +++ configure.ac 2016-02-25 19:37:00 +0000 @@ -1640,7 +1640,7 @@ if test "x$squid_pc_krb5_name" = "x"; then PKG_CHECK_EXISTS(heimdal-gssapi, [squid_pc_krb5_name="heimdal-gssapi"]) fi - if test "x$squid_pc_krb5_name" != "x" -a "$cross_compiling" = "no"; 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) if test "x$ac_cv_path_krb5_config" != "xno" ; then