dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable the whole bunch of FOO_DISABLE_DEPRECATED only for future versions

Browse source 
2004-11-04  Michael Natterer  <mitch@gimp.org>

	* configure.in: disable the whole bunch of FOO_DISABLE_DEPRECATED
	only for future versions of GLib, GTK+ and Pango because the
	upcoming new stable versions add no new deprecations that are
	relevant for the GIMP source.
This commit is contained in:
Michael Natterer 2004-11-04 15:27:10 +00:00 committed by Michael Natterer
parent 0c68b40fa5
commit 314d74ec8c
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-11-04 Michael Natterer <mitch@gimp.org>
* configure.in: disable the whole bunch of FOO_DISABLE_DEPRECATED
only for future versions of GLib, GTK+ and Pango because the
upcoming new stable versions add no new deprecations that are
relevant for the GIMP source.
2004-11-04 Michael Natterer <mitch@gimp.org>
* plug-ins/ifscompose/ifscompose.c: some undeprecation and

42
configure.in
View file

@ -394,13 +394,13 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 gobject-2.0)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_MSG_CHECKING([if GLib is version 2.5.0 or newer])
if $PKG_CONFIG --atleast-version=2.5.0 glib-2.0; then
have_glib_2_5=yes
AC_MSG_CHECKING([if GLib is version 2.7.0 or newer])
if $PKG_CONFIG --atleast-version=2.7.0 glib-2.0; then
have_glib_2_7=yes
else
have_glib_2_5=no
have_glib_2_7=no
fi
AC_MSG_RESULT($have_glib_2_5)
AC_MSG_RESULT($have_glib_2_7)
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
gimp_save_LIBS=$LIBS
@ -414,13 +414,13 @@ AC_PATH_XTRA
AM_PATH_GTK_2_0(gtk_required_version, :,
AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.))
AC_MSG_CHECKING([if GTK+ is version 2.5.0 or newer])
if $PKG_CONFIG --atleast-version=2.5.0 gtk+-2.0; then
have_gtk_2_5=yes
AC_MSG_CHECKING([if GTK+ is version 2.7.0 or newer])
if $PKG_CONFIG --atleast-version=2.7.0 gtk+-2.0; then
have_gtk_2_7=yes
else
have_gtk_2_5=no
have_gtk_2_7=no
fi
AC_MSG_RESULT($have_gtk_2_5)
AC_MSG_RESULT($have_gtk_2_7)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
AC_SUBST(GDK_PIXBUF_CFLAGS)
@ -444,13 +444,13 @@ PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= pangoft2_required_version, :,
AC_SUBST(PANGOFT2_CFLAGS)
AC_SUBST(PANGOFT2_LIBS)
AC_MSG_CHECKING([if Pango is version 1.5.0 or newer])
if $PKG_CONFIG --atleast-version=1.5.0 pango; then
have_pango_1_5=yes
AC_MSG_CHECKING([if Pango is version 1.9.0 or newer])
if $PKG_CONFIG --atleast-version=1.9.0 pango; then
have_pango_1_9=yes
else
have_pango_1_5=no
have_pango_1_9=no
fi
AC_MSG_RESULT($have_pango_1_5)
AC_MSG_RESULT($have_pango_1_9)
gimp_save_CFLAGS=$CFLAGS
CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
@ -1484,19 +1484,19 @@ AC_SUBST(GIMP_MKENUMS)
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED"
####################################################
# Default to disable deprecated GTK+ stuff for 2.4.x
####################################################
##############################################################
# Default to disable deprecated GTK+ stuff for 2.4.x and 2.6.x
##############################################################
if test "x$have_glib_2_5" != "xyes"; then
if test "x$have_glib_2_7" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi
if test "x$have_gtk_2_5" != "xyes"; then
if test "x$have_gtk_2_7" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
fi
if test "x$have_pango_1_5" != "xyes"; then
if test "x$have_pango_1_9" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
fi