callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

require glib >= 2.16.1. Don't warn about deprecations for glib >= 2.19.0

Browse Source 
2008-03-28  Michael Natterer  <mitch@gimp.org>

	* configure.in: require glib >= 2.16.1. Don't warn about
	deprecations for glib >= 2.19.0 and gtk+ >= 2.15.0. Remove check
	for GIO but keep the --without-gio option for the URI plugin.


svn path=/trunk/; revision=25275
This commit is contained in:
Michael Natterer
2008-03-28 13:26:17 +00:00
committed by Michael Natterer
parent e9e4fe2435
commit cd0c52d528
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-28 Michael Natterer <mitch@gimp.org>
* configure.in: require glib >= 2.16.1. Don't warn about
deprecations for glib >= 2.19.0 and gtk+ >= 2.15.0. Remove check
for GIO but keep the --without-gio option for the URI plugin.
2008-03-28 Sven Neumann <sven@gimp.org> 2008-03-28 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimphelpui.c: show a custom tooltip for menu * libgimpwidgets/gimphelpui.c: show a custom tooltip for menu

35
configure.in
View File

@ -41,7 +41,7 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
# required versions of other packages # required versions of other packages
m4_define([gegl_required_version], [0.0.16]) m4_define([gegl_required_version], [0.0.16])
m4_define([glib_required_version], [2.14.1]) m4_define([glib_required_version], [2.16.1])
m4_define([gtk_required_version], [2.12.1]) m4_define([gtk_required_version], [2.12.1])
m4_define([gdk_pixbuf_required_version], [gtk_required_version]) m4_define([gdk_pixbuf_required_version], [gtk_required_version])
m4_define([pangoft2_required_version], [1.18.0]) 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) PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
AC_MSG_CHECKING([if GLib is version 2.17.0 or newer]) AC_MSG_CHECKING([if GLib is version 2.19.0 or newer])
if $PKG_CONFIG --atleast-version=2.17.0 glib-2.0; then if $PKG_CONFIG --atleast-version=2.19.0 glib-2.0; then
have_glib_2_17=yes have_glib_2_19=yes
else else
have_glib_2_17=no have_glib_2_19=no
fi fi
AC_MSG_RESULT($have_glib_2_17) AC_MSG_RESULT($have_glib_2_19)
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in. # Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@ -463,11 +463,11 @@ AM_PATH_GTK_2_0(gtk_required_version, :,
AC_MSG_CHECKING([if GTK+ is version 2.17.0 or newer]) AC_MSG_CHECKING([if GTK+ is version 2.17.0 or newer])
if $PKG_CONFIG --atleast-version=2.17.0 gtk+-2.0; then if $PKG_CONFIG --atleast-version=2.17.0 gtk+-2.0; then
have_gtk_2_17=yes have_gtk_2_15=yes
else else
have_gtk_2_17=no have_gtk_2_15=no
fi fi
AC_MSG_RESULT($have_gtk_2_17) AC_MSG_RESULT($have_gtk_2_15)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version) PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
@ -1284,16 +1284,7 @@ uri_plugin=no
AC_ARG_WITH(gio, [ --without-gio build without GIO support]) AC_ARG_WITH(gio, [ --without-gio build without GIO support])
have_gio="no (disabled)" AM_CONDITIONAL(HAVE_GIO, test "x$with_gio" != xno)
if test "x$with_gio" != xno; then
PKG_CHECK_MODULES(GIO, gio-2.0,
have_gio=yes,
AC_MSG_RESULT([no])
have_gio="no (gio-2.0 not found)")
fi
AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = xyes)
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version" gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
@ -1348,7 +1339,7 @@ fi
AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes) AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes)
if test "x$have_gio" = xyes; then if test "x$with_gio" != xno; then
uri_plugin="yes (using GIO)" uri_plugin="yes (using GIO)"
elif test "x$have_gnomevfs" = xyes; then elif test "x$have_gnomevfs" = xyes; then
uri_plugin="yes (using gnome-vfs)" uri_plugin="yes (using gnome-vfs)"
@ -1845,11 +1836,11 @@ AC_SUBST(MIME_TYPES)
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED" CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED"
if test "x$have_glib_2_17" != "xyes"; then if test "x$have_glib_2_19" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED" CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi fi
if test "x$have_gtk_2_17" != "xyes"; then if test "x$have_gtk_2_15" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
fi fi