diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure
--- netatalk-3.1.7.orig/configure	2014-08-29 12:32:50.000000000 +0200
+++ netatalk-3.1.7/configure	2015-07-23 06:42:17.245794650 +0200
@@ -17226,8 +17226,8 @@
 
     if test x"$compilegssapi" != x"no" ; then
         if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then
-            export CFLAGS="-I$withval/include"
-            export LDFLAGS="-L$withval/${atalk_libname}"
+            export CFLAGS="$CFLAGS -I$withval/include"
+            export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}"
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5
 $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;}
         fi
@@ -17382,8 +17382,8 @@
 
     if test x"$FOUND_GSSAPI" = x"yes" ; then
         # check for functions
-        export CFLAGS="$GSSAPI_CFLAGS"
-        export LIBS="$GSSAPI_LIBS"
+        export CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
+        export LIBS="$LIBS $GSSAPI_LIBS"
         ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred"
 if test "x$ac_cv_func_gss_acquire_cred" = xyes; then :
 
diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4
--- netatalk-3.1.7.orig/macros/gssapi-check.m4	2013-10-28 14:43:14.000000000 +0100
+++ netatalk-3.1.7/macros/gssapi-check.m4	2015-07-23 06:42:12.475826699 +0200
@@ -18,8 +18,8 @@
 
     if test x"$compilegssapi" != x"no" ; then
         if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then
-            export CFLAGS="-I$withval/include"
-            export LDFLAGS="-L$withval/${atalk_libname}"
+            export CFLAGS="$CFLAGS -I$withval/include"
+            export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}"
             AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi])
         fi
 
@@ -64,8 +64,8 @@
 
     if test x"$FOUND_GSSAPI" = x"yes" ; then
         # check for functions
-        export CFLAGS="$GSSAPI_CFLAGS"
-        export LIBS="$GSSAPI_LIBS"
+        export CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
+        export LIBS="$LIBS $GSSAPI_LIBS"
         AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])])
 
         # Heimdal/MIT compatibility fix