dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert new glib dependency. 

2008-03-21  Michael Natterer  <mitch@gimp.org>

	* configure.in: revert new glib dependency.


svn path=/trunk/; revision=25160
This commit is contained in:
Michael Natterer 2008-03-21 19:49:22 +00:00 committed by Michael Natterer
parent 80a378971c
commit 34111ef02f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-03-21 Michael Natterer <mitch@gimp.org>
* configure.in: revert new glib dependency.
2008-03-21 Michael Natterer <mitch@gimp.org>
* configure.in: require glib >= 2.16.1. Don't warn about

14
configure.in
View File

@ -41,7 +41,7 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
# 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 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
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 @@ AC_SUBST(MIME_TYPES)
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