From c9f39dbff190ff3585122ce477f8ab76ef60dac2 Mon Sep 17 00:00:00 2001
From: Josh Andler <scislac@gmail.com>
Date: Sat, 18 Feb 2012 11:59:55 -0800
Subject: port checking glibmm version before applying
 G_DISABLE_SINGLE_INCLUDES

(bzr r10993)
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 69cdbf2a5..f2ac51dfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,10 @@ if test "$GCC" = "yes"; then
   # Enable all default warnings
   CPPFLAGS="-Wall $CPPFLAGS"
   # Enforce including only <glib.h> (required since 2.31)
-  CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+  PKG_CHECK_MODULES(NEW_GLIBMM, glibmm-2.4 >= 2.28, new_glibmm=yes, new_glibmm=no)
+  if test "x$new_glibmm" = "xyes"; then
+    CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+  fi
   # Ensure that no deprecated glibmm symbols are introduced.
   # lp:inkscape builds cleanly with this option at r10957
   CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS"
-- 
cgit v1.2.3