use G_DISABLE_DEPRECATED also when building against glib 2.10

2006-04-27  Michael Natterer  <mitch@gimp.org>

	* configure.in: use G_DISABLE_DEPRECATED also when building
	against glib 2.10
This commit is contained in:
Michael Natterer 2006-04-27 09:27:14 +00:00 committed by Michael Natterer
parent a34dd51bba
commit 827ca3a4cd
2 changed files with 11 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2006-04-27 Michael Natterer <mitch@gimp.org>
* configure.in: use G_DISABLE_DEPRECATED also when building
against glib 2.10
2006-04-27 Michael Natterer <mitch@gimp.org>
* app/menus/menus.c: namespace cleanup: renamed

View file

@ -407,13 +407,13 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 gobject-2.0)
AC_MSG_CHECKING([if GLib is version 2.9.0 or newer])
if $PKG_CONFIG --atleast-version=2.9.0 glib-2.0; then
have_glib_2_9=yes
AC_MSG_CHECKING([if GLib is version 2.11.0 or newer])
if $PKG_CONFIG --atleast-version=2.11.0 glib-2.0; then
have_glib_2_11=yes
else
have_glib_2_9=no
have_glib_2_11=no
fi
AC_MSG_RESULT($have_glib_2_9)
AC_MSG_RESULT($have_glib_2_11)
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
gimp_save_LIBS=$LIBS
@ -1649,7 +1649,7 @@ AC_SUBST(GIMP_MKENUMS)
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED"
if test "x$have_glib_2_9" != "xyes"; then
if test "x$have_glib_2_11" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi