From f40467638de40c19d7f4faeb3d7e320af2a76fb1 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 21 Sep 2003 22:13:23 +0000
Subject: [PATCH] find and detect the Heimdal GSSAPI include path properly

---
 configure.ac | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f0423011..4479e2dc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,14 +511,12 @@ AC_MSG_CHECKING([if GSSAPI support is requested])
 if test x"$want_gss" = xyes; then
   if test -z "$GSSAPI_INCS"; then
      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
-        gss_cppflags=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
-	CPPFLAGS="$CPPFLAGS $gss_cppflags"
+        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
      else
-        CPPFLAGS="$GSSAPI_ROOT/include"
+        GSSAPI_INCS=="-I$GSSAPI_ROOT/include"
      fi
-  else
-     CPPFLAGS="$CPPFLAGS $GSSAPI_INCS"
   fi
+  CPPFLAGS="$CPPFLAGS $GSSAPI_INCS"
   
   if test -z "$GSSAPI_LIB_DIR"; then
      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
@@ -533,6 +531,12 @@ if test x"$want_gss" = xyes; then
 
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_GSSAPI, 1, [if you have the gssapi libraries])
+
+  if test -n "$GSSAPI_INCS"; then
+    # cut off the preceding -I from the include path
+    GSSAPI_INCS=`echo $GSSAPI_INCS | sed -e s/^-I//g`
+  fi
+
   if test -f "$GSSAPI_INCS/gssapi.h"; then
       AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
   else