diff --git a/ChangeLog b/ChangeLog
index 144e9f2e12..0f99dc1aca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar 28 22:42:49 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* configure.in (gimpdir): Removed duplicate saving of
+	cflags. Add GTK_CFLAGS to CPPFLAGS for library tests,
+	instead of to CFLAGS.
+
 Fri Mar 27 13:41:55 EST 1998 Matthew Wilson <msw@gimp.org>
 
 	* app/floating_sel.c: Always update the drawable when converting
diff --git a/configure.in b/configure.in
index 7495f38823..de0ed629a8 100644
--- a/configure.in
+++ b/configure.in
@@ -63,12 +63,6 @@ AC_PROG_MAKE_SET
 AC_PROG_CPP
 AC_GIMP_CHECK
 
-gimp_save_CFLAGS="$CFLAGS"
-gimp_save_LIBS="$LIBS"
-
-CFLAGS="$GTK_CFLAGS $CFLAGS"
-LIBS="$LIBS $GTK_LIBS"
-
 if eval "test x$GCC = xyes"; then
   if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then
     CFLAGS="$CFLAGS"
@@ -91,10 +85,10 @@ if eval "test x$GCC = xyes"; then
   fi
 fi
 
-gimp_save_CFLAGS="$CFLAGS"
+gimp_save_CPPFLAGS="$CPPFLAGS"
 gimp_save_LIBS="$LIBS"
 
-CFLAGS="$GTK_CFLAGS $CFLAGS"
+CPPFLAGS="$GTK_CFLAGS $CPPFLAGS"
 LIBS="$LIBS $GTK_LIBS"
 
 dnl Test for Xmu
@@ -277,7 +271,7 @@ AC_CHECK_FUNC(random,
 dnl check for difftime
 AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME))
 
-CFLAGS="$gimp_save_CFLAGS"
+CPPFLAGS="$gimp_save_CPPFLAGS"
 LIBS="$gimp_save_LIBS"
 
 gimpdatadir=$datadir/gimp