From a217f338f34f0f693e5ec6bbfa770fdcd22f61b8 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Thu, 26 Mar 2009 13:54:13 +0000 Subject: Argh! svn merge cannot merge renames properly, instead it just dropped in the file from trunk! svn path=/branches/glibmm-2-18/; revision=813 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1e238547..697f6e92 100644 --- a/configure.ac +++ b/configure.ac @@ -13,8 +13,8 @@ # pushdef([GLIBMM_MAJOR_VERSION], [2]) -pushdef([GLIBMM_MINOR_VERSION], [20]) -pushdef([GLIBMM_MICRO_VERSION], [0]) +pushdef([GLIBMM_MINOR_VERSION], [18]) +pushdef([GLIBMM_MICRO_VERSION], [2]) pushdef([GLIBMM_EXTRA_VERSION], []) pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION) @@ -131,7 +131,7 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo]) # Dependancy checks ######################################################################### gtkmm_min_sigc_version=2.0.0 -gtkmm_min_glib_version=2.19.8 +gtkmm_min_glib_version=2.17.3 PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version}) AC_SUBST(GLIBMM_CFLAGS) -- cgit v1.2.1