diff --git a/configure b/configure
index 4d8f625f2c..7546b407d8 100755
--- a/configure
+++ b/configure
@@ -13855,8 +13855,6 @@ done
 		    as_fn_error $? "krb5.h not found" "$LINENO" 5
 		fi
 
-		CPPFLAGS="$saved_cppflags"
-
 		#
 		# XXXDCL This probably doesn't work right on all systems.
 		# It will need to be worked on as problems become evident.
@@ -13933,6 +13931,8 @@ $as_echo "no" >&6; } ;;
 		    esac
 		done
 
+		CPPFLAGS="$saved_cppflags"
+
 		case $gssapi_linked in
 		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
 		esac
diff --git a/configure.in b/configure.in
index f634c1af61..1c8b18822d 100644
--- a/configure.in
+++ b/configure.in
@@ -782,8 +782,6 @@ case "$use_gssapi" in
 		    AC_MSG_ERROR([krb5.h not found])
 		fi
 
-		CPPFLAGS="$saved_cppflags"
-
 		#
 		# XXXDCL This probably doesn't work right on all systems.
 		# It will need to be worked on as problems become evident.
@@ -841,6 +839,8 @@ $krb5_hack
 		    esac
 		done
 
+		CPPFLAGS="$saved_cppflags"
+
 		case $gssapi_linked in
 		no) AC_MSG_ERROR(could not determine proper GSSAPI linkage) ;;
 		esac