diff options
| author | Josh Andler <scislac@gmail.com> | 2012-02-18 19:59:55 +0000 |
|---|---|---|
| committer | Josh Andler <scislac@gmail.com> | 2012-02-18 19:59:55 +0000 |
| commit | c9f39dbff190ff3585122ce477f8ab76ef60dac2 (patch) | |
| tree | 02937da2f0f8e5792b0556fb6b5e0255a5fdb70a | |
| parent | Fix for 171579 : Make inkscape remember dialogs window status (diff) | |
| download | inkscape-c9f39dbff190ff3585122ce477f8ab76ef60dac2.tar.gz inkscape-c9f39dbff190ff3585122ce477f8ab76ef60dac2.zip | |
port checking glibmm version before applying G_DISABLE_SINGLE_INCLUDES
(bzr r10993)
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
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" |