gimp r25160 - trunk

[mitch svn gnome org]

Author: mitch
Date: Fri Mar 21 19:49:22 2008
New Revision: 25160
URL: http://svn.gnome.org/viewvc/gimp?rev=25160&view=rev

Log:
2008-03-21  Michael Natterer  <mitch gimp org>

	* configure.in: revert new glib dependency.



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Mar 21 19:49:22 2008
@@ -41,7 +41,7 @@
 
 # required versions of other packages
 m4_define([gegl_required_version], [0.0.16])
-m4_define([glib_required_version], [2.16.1])
+m4_define([glib_required_version], [2.14.1])
 m4_define([gtk_required_version], [2.12.1])
 m4_define([gdk_pixbuf_required_version], [gtk_required_version])
 m4_define([pangoft2_required_version], [1.18.0])
@@ -436,13 +436,13 @@
 
 PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
 
-AC_MSG_CHECKING([if GLib is version 2.19.0 or newer])
-if $PKG_CONFIG --atleast-version=2.19.0 glib-2.0; then
-  have_glib_2_19=yes
+AC_MSG_CHECKING([if GLib is version 2.17.0 or newer])
+if $PKG_CONFIG --atleast-version=2.17.0 glib-2.0; then
+  have_glib_2_17=yes
 else
-  have_glib_2_19=no
+  have_glib_2_17=no
 fi
-AC_MSG_RESULT($have_glib_2_19)
+AC_MSG_RESULT($have_glib_2_17)
 
 
 # Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -1845,7 +1845,7 @@
 
 CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED"
 
-if test "x$have_glib_2_19" != "xyes"; then
+if test "x$have_glib_2_17" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
 fi