------------------------------------------------------------
revno: 13744
revision-id: squid3@treenet.co.nz-20150201091544-kqejhmyjqudnj4gg
parent: squid3@treenet.co.nz-20150201091412-6b51g4ap25hj83fy
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4172
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sun 2015-02-01 01:15:44 -0800
message:
  Bug 4172: Solaris broken krb5-config
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150201091544-kqejhmyjqudnj4gg
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 7cfca0712fa2a43e8613dae84066d3957bf0913d
# timestamp: 2015-02-01 09:17:02 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150201091412-\
#   6b51g4ap25hj83fy
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2015-01-13 12:51:27 +0000
+++ configure.ac	2015-02-01 09:15:44 +0000
@@ -1583,8 +1583,12 @@
     AC_MSG_NOTICE([Use krb5-config to get CXXFLAGS and LIBS])
     LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags krb5 2>/dev/null`"
     LIB_KRB5_LIBS="`$ac_krb5_config --libs krb5 2>/dev/null`"
-    LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags gssapi 2>/dev/null` $LIB_KRB5_CFLAGS"
-    LIB_KRB5_LIBS="`$ac_krb5_config --libs gssapi 2>/dev/null` $LIB_KRB5_LIBS"
+    # Solaris 10 Update 11 patches the krb5-config tool to produce stderr messages on stdout.
+    SOLARIS_BROKEN_KRB5CONFIG_GSSAPI="`$ac_krb5_config --libs gssapi 2>/dev/null | grep "krb5-config"`"
+    if test "x$SOLARIS_BROKEN_KRB5CONFIG_GSSAPI" = "x"; then
+      LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags gssapi 2>/dev/null` $LIB_KRB5_CFLAGS"
+      LIB_KRB5_LIBS="`$ac_krb5_config --libs gssapi 2>/dev/null` $LIB_KRB5_LIBS"
+    fi
   else
     ## For some OS pkg-config is broken or unavailable.
     ## Detect libraries the hard way.