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

configure: depend on GLib >= 2.30.2 

For the reasons mentioned in the last version bump commit below.
This commit is contained in:
Michael Natterer 2011-11-30 23:32:00 +01:00
parent 1ef3fe7f07
commit 6cff213038
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/sanity.c
View File

@ -130,8 +130,8 @@ static gchar *
sanity_check_glib (void)
{
#define GLIB_REQUIRED_MAJOR 2
#define GLIB_REQUIRED_MINOR 28
#define GLIB_REQUIRED_MICRO 8
#define GLIB_REQUIRED_MINOR 30
#define GLIB_REQUIRED_MICRO 2
const gchar *mismatch = glib_check_version (GLIB_REQUIRED_MAJOR,
GLIB_REQUIRED_MINOR,

14
configure.ac
View File

@ -42,7 +42,7 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
# required versions of other packages
m4_define([babl_required_version], [0.1.6])
m4_define([gegl_required_version], [0.1.8])
m4_define([glib_required_version], [2.28.8])
m4_define([glib_required_version], [2.30.2])
m4_define([gtk_required_version], [2.24.7])
m4_define([gdk_pixbuf_required_version], [2.24.0])
m4_define([cairo_required_version], [1.10.2])
@ -481,13 +481,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.30.0 or newer])
if $PKG_CONFIG --atleast-version=2.30.0 glib-2.0; then
have_glib_2_30=yes
AC_MSG_CHECKING([if GLib is version 2.31.0 or newer])
if $PKG_CONFIG --atleast-version=2.31.0 glib-2.0; then
have_glib_2_31=yes
else
have_glib_2_30=no
have_glib_2_31=no
fi
AC_MSG_RESULT($have_glib_2_30)
AC_MSG_RESULT($have_glib_2_31)
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@ -1947,7 +1947,7 @@ CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEA
# We must build without problems with future releases of libraries
# and disabling deprecated API risks breaking the build
if test "x$have_glib_2_30" != "xyes"; then
if test "x$have_glib_2_31" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi