summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2016-06-29 18:58:53 -0700
committerKevin McCarthy <kevin@8t8.us>2016-06-29 18:58:53 -0700
commitebe99340265b1dc891109fe33a1cc900484720b2 (patch)
tree0b4bf0d779a7aac57a81c8694012255bb824a2a3 /m4
parent51d0c9c6bd566a6a1e8463491a51ed20f454c85a (diff)
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.
Diffstat (limited to 'm4')
-rw-r--r--m4/gssapi.m44
1 files changed, 2 insertions, 2 deletions
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";;