From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 1 Feb 2015 07:05:48 +0000 (-0800)
Subject: Bug 4172: Solaris broken krb5-config
X-Git-Tag: merge-candidate-3-v1~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2da83daf531af42cd16219ac2b29a42d7fc6b45;p=thirdparty%2Fsquid.git

Bug 4172: Solaris broken krb5-config
---

diff --git a/configure.ac b/configure.ac
index 9d5565cee6..15268461c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1606,8 +1606,12 @@ if test "x$with_solaris_krb5" = "xyes"; then
     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.