vte r2155 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Thu Nov 20 16:09:15 2008
New Revision: 2155
URL: http://svn.gnome.org/viewvc/vte?rev=2155&view=rev

Log:
2008-11-20  Behdad Esfahbod  <behdad gnome org>

        Bug 560819 â Remove obsolete backends

        * configure.in:
        * src/Makefile.am:
        * src/vtedraw.c:
        * src/vtepangox.c:
        * src/vtepangox.h:
        Remove pangox backend.



Removed:
   trunk/src/vtepangox.c
   trunk/src/vtepangox.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/vtedraw.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Nov 20 16:09:15 2008
@@ -344,31 +344,6 @@
 fi
 AM_CONDITIONAL(BUILD_XFT, test "x$with_xft2" = "xyes")
 
-# Use PangoX if we have it and it isn't disabled.
-if test "x$usedeprecation" != "xyes" ; then
-	if test "x$have_x" = "xyes" ; then
-		AC_ARG_WITH(pangox,
-			    [AS_HELP_STRING([--with-pangox],
-					    [enable drawing using PangoX])
-			    ], with_pangox=$withval, with_pangox=yes)
-		if test "x$with_pangox" = "xyes" ; then
-			PKG_CHECK_EXISTS(pangox, [
-				AC_DEFINE(HAVE_PANGOX, 1, 
-					  [Whether we have PangoX])
-				wantedmodules="$wantedmodules pangox"
-				],[
-				AC_MSG_WARN([PangoX not detected])
-				with_pangox="no - not detected"
-				])
-		fi
-	else
-		with_pangox="no - missing X Window System"
-	fi
-else
-	with_pangox="no - deprecated"
-fi
-AM_CONDITIONAL(BUILD_PANGOX, test "x$with_pangox" = "xyes")
-
 # Use glX if we have it and it isn't disabled.
 if test "$have_x" = yes ; then
 	AC_ARG_WITH(glX,[AS_HELP_STRING(--with-glX,enable drawing using glX)],with_glx=$withval,with_glx=no)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Nov 20 16:09:15 2008
@@ -118,11 +118,6 @@
 	vtexft.c \
 	vtexft.h
 endif
-if BUILD_PANGOX
-libvte_la_SOURCES += \
-	vtepangox.c \
-	vtepangox.h
-endif
 
 libvte_la_LDFLAGS = $(LDFLAGS) \
 	-version-info $(LIBVTE_LTVERSION) \

Modified: trunk/src/vtedraw.c
==============================================================================
--- trunk/src/vtedraw.c	(original)
+++ trunk/src/vtedraw.c	Thu Nov 20 16:09:15 2008
@@ -32,7 +32,6 @@
 #include "vtegl.h"
 #include "vtepango.h"
 #include "vtepangocairo.h"
-#include "vtepangox.h"
 #include "vteskel.h"
 #include "vtexft.h"
 
@@ -52,9 +51,6 @@
 #endif /* !X_DISPLAY_MISSING */
 	&_vte_draw_pango,
 #ifndef X_DISPLAY_MISSING
-#ifdef HAVE_PANGOX
-	&_vte_draw_pangox,
-#endif /* HAVE_PANGOX */
 #endif /* !X_DISPLAY_MISSING */
 };