vte r2294 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Tue Dec  2 12:26:25 2008
New Revision: 2294
URL: http://svn.gnome.org/viewvc/vte?rev=2294&view=rev

Log:
	* configure.in: Enable maintainer mode by default. Define more
	deprecation defines, and define the *_DISABLE_SINGLE_INCLUDES defines.
	Enable deprecations by default in maintainer mode.
	* src/vteapp.c: Undef VTE_DISABLE_DEPRECATED here.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/vteapp.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Dec  2 12:26:25 2008
@@ -11,6 +11,11 @@
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
 
+if test -z "$enable_maintainer_mode"; then
+  enable_maintainer_mode=yes
+fi
+AM_MAINTAINER_MODE([enable])
+
 ################################################################################
 # Libtool shared library versioning stuffs.
 # REVISION gets incremented whenever the source code changes without adding
@@ -32,10 +37,15 @@
 AC_PROG_CC
 AC_STDC_HEADERS
 AM_PROG_CC_STDC
-AM_MAINTAINER_MODE
+
 AM_PROG_CC_C_O
 
 AM_PROG_LIBTOOL
+
+################################################################################
+# i18n
+################################################################################
+
 IT_PROG_INTLTOOL([0.35.0])
 
 GETTEXT_PACKAGE=vte
@@ -191,7 +201,33 @@
 	AC_DEFINE(VTE_DEBUG,1,[Enable debugging messages.])
 fi
 
+################################################################################
+
+GNOME_COMMON_INIT
 
+# Disable deprecations and single includes
+# We don't use GNOME_MAINTAINER_MODE_DEFINES here since it's too much and
+# it also defines VTE's own defines.
+AC_ARG_ENABLE([deprecation],
+  [AS_HELP_STRING([--disable-deprecation],
+                  [prohibit VTE from using deprecated GLib/Pango/ATK/GDK/GTK+ features (default: $enable_maintainer_mode)])],
+  [],[enable_deprecation=$enable_maintainer_mode])
+if test "enable_deprecation"; then
+  AC_MSG_NOTICE([disabling deprecated GLIB/PANGO/GDK/ATK/GTK+ features])
+
+  AC_DEFINE([ATK_DISABLE_DEPRECATED],[1],[Disable deprecated features])
+  AC_DEFINE([ATK_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes])
+  AC_DEFINE([G_DISABLE_DEPRECATED],[1],[Disable deprecated features])
+  AC_DEFINE([G_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes])
+  AC_DEFINE([GDK_DISABLE_DEPRECATED],[1],[Disable deprecated features])
+  AC_DEFINE([GDK_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes])
+  AC_DEFINE([GDK_PIXBUF_DISABLE_DEPRECATED],[1],[Disable deprecated features])
+  AC_DEFINE([GDK_PIXBUF_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes])
+  AC_DEFINE([GTK_DISABLE_DEPRECATED],[1],[Disable deprecated features])
+  AC_DEFINE([GTK_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes])
+  AC_DEFINE([PANGO_DISABLE_DEPRECATED],[1],[Disable deprecated features])
+  AC_DEFINE([PANGO_DISABLE_SINGLE_INCLUDES],[1],[Disable single includes])
+fi
 
 ################################################################################
 # Core
@@ -224,19 +260,6 @@
 PKG_CHECK_MODULES(GOBJECT,[glib-2.0 gobject-2.0])
 PKG_CHECK_MODULES(GTK,[glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-2.0 >= $GTK_REQUIRED])
 
-AC_ARG_ENABLE(deprecation,
-	      [AS_HELP_STRING([--enable-deprecation],
-			      [prohibit VTE from using deprecated GLib/Pango/GDK/GTK+ features])
-	      ],
-	      usedeprecation=$enableval, usedeprecation=no)
-if test "x$usedeprecation" = "xyes" ; then
-	AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib features.])
-	AC_DEFINE(GDK_DISABLE_DEPRECATED, 1, [Disable deprecated GDK features.])
-	AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED, 1, [Disable deprecated gdk-pixbuf features.])
-	AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK+ features.])
-	AC_DEFINE(PANGO_DISABLE_DEPRECATED, 1, [Disable deprecated Pango features.])
-fi
-
 # Let the user specify the default terminal emulation.
 AC_ARG_WITH(default-emulation,
 AS_HELP_STRING(--with-default-emulation=xterm,default terminal type to be emulated),

Modified: trunk/src/vteapp.c
==============================================================================
--- trunk/src/vteapp.c	(original)
+++ trunk/src/vteapp.c	Tue Dec  2 12:26:25 2008
@@ -29,6 +29,8 @@
 #include <gtk/gtk.h>
 #include <glib-object.h>
 #include "debug.h"
+
+#undef VTE_DISABLE_DEPRECATED
 #include "vte.h"
 
 #include <glib/gi18n.h>