diff options
| author | Daniel Elstner <daniel@src.gnome.org> | 2009-03-26 13:54:13 +0000 |
|---|---|---|
| committer | Daniel Elstner <daniel@src.gnome.org> | 2009-03-26 13:54:13 +0000 |
| commit | a217f338f34f0f693e5ec6bbfa770fdcd22f61b8 (patch) | |
| tree | 415899c71d3e92320e92e7ba4c6878dd1c6640af | |
| parent | 2b133867392c2449d96c28346662988b5741c1d6 (diff) | |
| download | glibmm-a217f338f34f0f693e5ec6bbfa770fdcd22f61b8.tar.gz | |
Argh! svn merge cannot merge renames properly, instead it just dropped in the file from trunk!
svn path=/branches/glibmm-2-18/; revision=813
| -rw-r--r-- | configure.ac | 6 |
1 files 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) |