glibmm r813 - branches/glibmm-2-18

[daniel svn gnome org]

Author: daniel
Date: Thu Mar 26 13:54:13 2009
New Revision: 813
URL: http://svn.gnome.org/viewvc/glibmm?rev=813&view=rev

Log:
Argh!  svn merge cannot merge renames properly, instead it just dropped in the file from trunk!


Modified:
   branches/glibmm-2-18/configure.ac

Modified: branches/glibmm-2-18/configure.ac
==============================================================================
--- branches/glibmm-2-18/configure.ac	(original)
+++ branches/glibmm-2-18/configure.ac	Thu Mar 26 13:54:13 2009
@@ -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 @@
 #  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)