[gimp] configure: build with DISABLE_DEPRECATED also for GTK+ 2.24

[Michael Natterer <mitch src gnome org>]

commit 8d8c6bb9ea9b5e3a7df5c58a94c0304c6b08a0e4
Author: Michael Natterer <mitch gimp org>
Date:   Sun Feb 6 12:50:14 2011 +0100

    configure: build with DISABLE_DEPRECATED also for GTK+ 2.24
    
    Bump the "too new" test to GTK+ 2.26 which will never be released, but
    this way we can keep the configure check around for later reuse after
    the switch to GTK+ 3.x. Also bump the "too new" GLib and Pango
    versions to really future versions so we early-catch deprecations
    in the current development cycle.

 app/display/gimpscalecombobox.h |    2 +-
 configure.ac                    |   34 ++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/app/display/gimpscalecombobox.h b/app/display/gimpscalecombobox.h
index 41819aa..9ab2db7 100644
--- a/app/display/gimpscalecombobox.h
+++ b/app/display/gimpscalecombobox.h
@@ -22,7 +22,7 @@
 #define __GIMP_SCALE_COMBO_BOX_H__
 
 
-#if GTK_CHECK_VERSION(2,23,1) && !GTK_CHECK_VERSION(2,24,0)
+#if GTK_CHECK_VERSION(2,23,1)
 #undef GTK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_SINGLE_INCLUDES
 #undef __GTK_COMBO_BOX_ENTRY_H__
diff --git a/configure.ac b/configure.ac
index 8269e24..a76cf38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,13 +467,13 @@ PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
 
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
-AC_MSG_CHECKING([if GLib is version 2.26.0 or newer])
-if $PKG_CONFIG --atleast-version=2.26.0 glib-2.0; then
-  have_glib_2_26=yes
+AC_MSG_CHECKING([if GLib is version 2.28.0 or newer])
+if $PKG_CONFIG --atleast-version=2.28.0 glib-2.0; then
+  have_glib_2_28=yes
 else
-  have_glib_2_26=no
+  have_glib_2_28=no
 fi
-AC_MSG_RESULT($have_glib_2_26)
+AC_MSG_RESULT($have_glib_2_28)
 
 
 # Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -492,13 +492,15 @@ AM_PATH_GTK_2_0(gtk_required_version, :,
   AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.),
   gthread)
 
-AC_MSG_CHECKING([if GTK+ is version 2.24.0 or newer])
-if $PKG_CONFIG --atleast-version=2.24.0 gtk+-2.0; then
-  have_gtk_2_24=yes
+# GTK+ 2.26.0 will never be released, we keep the check around anyway
+# because we will need it again after the switch to GTK+ 3.x
+AC_MSG_CHECKING([if GTK+ is version 2.26.0 or newer (bogus placeholder check)])
+if $PKG_CONFIG --atleast-version=2.26.0 gtk+-2.0; then
+  have_gtk_2_26=yes
 else
-  have_gtk_2_24=no
+  have_gtk_2_26=no
 fi
-AC_MSG_RESULT($have_gtk_2_24)
+AC_MSG_RESULT($have_gtk_2_26)
 
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
 
@@ -1916,19 +1918,19 @@ AC_SUBST(MIME_TYPES)
 
 CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
 
-# Make sure not to disable deprecated APIs for unreleased version, we
-# must build without problems with future releases of libraries and
-# disabling deprecated API risks breaking the build
+# Make sure not to disable deprecated APIs for unreleased versions.
+# We must build without problems with future releases of libraries
+# and disabling deprecated API risks breaking the build
 
-if test "x$have_glib_2_26" != "xyes"; then
+if test "x$have_glib_2_30" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
 fi
 
-if test "x$have_gtk_2_24" != "xyes"; then
+if test "x$have_gtk_2_26" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 
-if test "x$have_pango_1_30" != "xyes"; then
+if test "x$have_pango_1_32" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
 fi