summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-11-18 12:21:49 +0100
committerMurray Cumming <murrayc@murrayc.com>2011-11-18 12:55:12 +0100
commit60c2cba8a813e81eebd8ba302731dbfe2089b356 (patch)
tree9b2fca435dfeffe7c9395564393bdc44ef307d94
parent290483533a14dbcbf73737d6bb98b22c031ac592 (diff)
downloadglibmm-60c2cba8a813e81eebd8ba302731dbfe2089b356.tar.gz
Require glibmm 2.2.10 so that make check works.
* configure.ac: Bug #663686 (Michael Biebl) Conflicts: ChangeLog
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c2a2962d..0f6e5176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-18 Murray Cumming <murrayc@murrayc.com>
+
+ Require glibmm 2.2.10 so that make check works.
+
+ * configure.ac: Bug #663686 (Michael Biebl)
+
2011-11-16 Hub Figuière <hub@figuiere.net>
Ensure template parameter has a space before to avoid trigraphs.
diff --git a/configure.ac b/configure.ac
index 724903e9..1f640987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AS_IF([test "x$enable_static" = xyes],
glibreq='2.0 >= 2.31.0'
-GLIBMM_MODULES="sigc++-2.0 >= 2.0.10 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
+GLIBMM_MODULES="sigc++-2.0 >= 2.2.10 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"