From: Kevin McCarthy <kevin@8t8.us>
Date: Thu, 30 Jun 2016 01:58:53 +0000 (-0700)
Subject: Fix cppflags and muttlibs duplication with --with-gss.
X-Git-Tag: mutt-1-7-rel~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebe99340265b1dc891109fe33a1cc900484720b2;p=mutt

Fix cppflags and muttlibs duplication with --with-gss.

When krb5-config was found, MUTT_AM_PATH_GSSAPI included CFLAGS in
GSSAPI_CFLAGS and MUTTLIBS in GSSAPI_LIBS.  However, configure.ac
afterwards sets:
    CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
    MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
This caused the flags and libs to be duplicated.
---

diff --git a/m4/gssapi.m4 b/m4/gssapi.m4
index e8451eaa..0e0194e6 100644
--- a/m4/gssapi.m4
+++ b/m4/gssapi.m4
@@ -23,8 +23,8 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
   AC_PATH_PROG(KRB5CFGPATH, krb5-config, none, $krb5_path)
   if test "$KRB5CFGPATH" != "none"
   then
-    GSSAPI_CFLAGS="$CPPFLAGS `$KRB5CFGPATH --cflags gssapi`"
-    GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
+    GSSAPI_CFLAGS="`$KRB5CFGPATH --cflags gssapi`"
+    GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`"
     case "`$KRB5CFGPATH --version`" in
       "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
       ?eimdal*)		GSSAPI_IMPL="Heimdal";;