From: pabs Date: Sat, 9 Feb 2008 07:23:25 +0000 (+0000) Subject: The previous commit caused CXXFLAGS to be polluted for tests after the one for Gtk... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=229ad95b254b58e8f95993ffd81d82408cb861bd;p=synfig.git The previous commit caused CXXFLAGS to be polluted for tests after the one for Gtk::AboutDialog::set_program_name, save CXXFLAGS before the test and restore it afterwards. git-svn-id: http://svn.voria.com/code@1637 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac index 54bf1d8..d29ee5f 100755 --- a/synfig-studio/trunk/configure.ac +++ b/synfig-studio/trunk/configure.ac @@ -89,7 +89,8 @@ esac PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[ AC_MSG_CHECKING([for Gtk::AboutDialog::set_program_name]) - CXXFLAGS="$GTKMM_CFLAGS" + synfigstudio_save_cxxflags="$CXXFLAGS" + CXXFLAGS="$GTKMM_CFLAGS $CXXFLAGS" AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM([ @@ -106,6 +107,7 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[ AM_CONDITIONAL(HAVE_GTK_ABOUTDIALOG_SET_PROGRAM_NAME,false) ] ) + CXXFLAGS="$synfigstudio_save_cxxflags" ],[ AC_MSG_ERROR([ ** Gtkmm-2.4 Is a required library, aborting.]) ])