Chech for single header includes.

When maintainer mode is enabled, check for single header includes as
well as deprecated flags (#557070).

diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 21f3ef1..5dfa67e 100644 (file)
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -38,10 +38,12 @@ AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
 [
        AC_REQUIRE([AM_MAINTAINER_MODE])
 
+       DISABLE_DEPRECATED=""
        if test $USE_MAINTAINER_MODE = yes; then
-               DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-       else
-               DISABLE_DEPRECATED=""
-       fi
+               DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
+               for DOMAIN in $DOMAINS; do
+                      DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
+               done
+
        AC_SUBST(DISABLE_DEPRECATED)
 ])