From 3b249ec65aeba349f2a71ec9025e66153755057f Mon Sep 17 00:00:00 2001 From: Peter Clifton Date: Thu, 3 Jan 2013 02:41:34 +0000 Subject: [PATCH] configure.ac: Save and restore CPPFLAGS either side of test for libgd Ensure we add GD_CFLAGS to the the main flag list later instead. --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 63a2faa9fd..5ea54c4005 100644 --- a/configure.ac +++ b/configure.ac @@ -792,8 +792,10 @@ you will get lucky. # since some linux systems evidently install gdlib-config but fail to # install the headers (nice), check for the header too and fail if it # is not there. + save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $GD_CFLAGS" AC_CHECK_HEADERS(gd.h) + CPPFLASS="$save_CPPFLAGS" case $ac_cv_header_gd_h in no ) AC_MSG_ERROR([ @@ -1106,7 +1108,7 @@ AC_DEFINE_UNQUOTED([COORD_MAX],[$COORD_MAX], # ------------- Complete set of CFLAGS and LIBS ------------------- -CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $CAIRO_CFLAGS $GTKGLEXT_CFLAGS $GLU_CFLAGS $GL_CFLAGS" +CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $GD_CFLAGS $CAIRO_CFLAGS $GTKGLEXT_CFLAGS $GLU_CFLAGS $GL_CFLAGS" LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS $CAIRO_LIBS $GTKGLEXT_LIBS $GLU_LIBS $GL_LIBS" -- 2.11.4.GIT