diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-29 12:33:42 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-29 12:33:42 +0000 |
| commit | 29535db981d44afcd909bf927a81c39263ec5597 (patch) | |
| tree | 33a87b5721be6d0f3d6442a656ab46e4ffd94b15 | |
| parent | Cleanup of unused variables and warnings. (diff) | |
| download | inkscape-29535db981d44afcd909bf927a81c39263ec5597.tar.gz inkscape-29535db981d44afcd909bf927a81c39263ec5597.zip | |
Fix glibmm 2.28 check and guard against inclusion of deprecated gtk headers
(bzr r11032)
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index fd39dcee5..0532c6d0b 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ if test "$GCC" = "yes"; then # lp:inkscape builds cleanly with this option at r10957 CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" CPPFLAGS="-DG_DISABLE_DEPRECATED $CPPFLAGS" + CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS" # Test for -Werror=... (introduced some time post-4.0) # If we hit a format error -- it should be fatal. @@ -752,9 +753,9 @@ dnl top-level <glib.h>, because they are all deprecated in glib >= 2.31. dnl However, glibmm < 2.28 *does* include the deprecated glib headers, so we dnl can only define the deprecation-checking compiler flag if we're using dnl glibmm versions. -PKG_CHECK_MODULES(GTKMM_2_28, gtkmm-2.4 >= 2.28, with_gtkmm_2_28=yes, with_gtkmm_2_28=no) -if test "x$with_gtkmm_2_28" = "xyes"; then - AC_DEFINE(WITH_GTKMM_2_28,1,[Build with Gtkmm 2.28.x or higher]) +PKG_CHECK_MODULES(GLIBMM_2_28, glibmm-2.4 >= 2.28, with_glibmm_2_28=yes, with_glibmm_2_28=no) +if test "x$with_glibmm_2_28" = "xyes"; then + AC_DEFINE(WITH_GLIBMM_2_28,1,[Build with Glibmm 2.28.x or higher]) CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS" fi |