From a5abe51580cbe0e88369002c7d82670bce88b573 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Thu, 11 Aug 2011 02:08:30 +0000 Subject: Add -DG_DISABLE_SINGLE_INCLUDES to CFLAGS Also: Move the addition of -DG_DISABLE_DEPRECATED to CFLAGS so that it actually takes effect. svn path=/trunk/; revision=38466 --- configure.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index d59ff6f7d2..857ac63a49 100644 --- a/configure.in +++ b/configure.in @@ -880,6 +880,14 @@ else fi fi +# Error out if a glib header other than a "top level" header +# (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h) +# is used. +CFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CFLAGS" + +# Error out on the usage of deprecated glib functions +CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" + # # Check whether GLib modules are supported, to determine whether we # can support plugins. @@ -888,8 +896,6 @@ AC_MSG_CHECKING(whether GLib supports loadable modules) ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" -# Error out on the usage of deprecated glib functions -CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED" LIBS="$GLIB_LIBS $LIBS" AC_TRY_RUN([ #include -- cgit v1.2.1