[vte/vte-next: 1/114] Drop gtk+-2.0 support

[Christian Persch <chpe src gnome org>]

commit 707a47b547cd813bfdcd0a64140b0a22079e2a81
Author: Christian Persch <chpe gnome org>
Date:   Mon May 2 19:51:21 2011 +0200

    Drop gtk+-2.0 support

 Makefile.am  |    4 ----
 configure.in |   24 ++++++------------------
 2 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 570c801..91c7109 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,6 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
 SUBDIRS = src termcaps po doc perf
 
-if HAVE_GTK_2
-SUBDIRS += python
-endif
-
 EXTRA_DIST = \
 	MAINTAINERS \
 	HACKING \
diff --git a/configure.in b/configure.in
index b19faf9..db5eac8 100644
--- a/configure.in
+++ b/configure.in
@@ -40,25 +40,16 @@ AC_SUBST([LT_VERSION_INFO])
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
 AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+  [AS_HELP_STRING([--with-gtk=3.0],[which gtk+ version to compile against (default: 3.0)])],
   [case "$with_gtk" in
-     2.0|3.0) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+     3.0) ;;
+     2.0) AC_MSG_ERROR([unsupported gtk version $with_gtk specified]) ;;
+     *) AC_MSG_ERROR([invalid gtk version $with_gtk specified]) ;;
    esac],
-  [with_gtk=2.0])
+  [with_gtk=3.0])
 AC_MSG_RESULT([$with_gtk])
 
 case "$with_gtk" in
-  2.0) VTE_API_VERSION=0.0
-       VTE_API_MAJOR_VERSION=0
-       VTE_API_MINOR_VERSION=0
-       VTE_PC_VERSION=
-       VTE_LIBRARY_SUFFIX=
-       VTE_SEAL_CFLAGS=
-       GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.20.0
-       GLADE_API_VERSION=1.0
-       ;;
   3.0) VTE_API_VERSION=2.90
        VTE_API_MAJOR_VERSION=2
        VTE_API_MINOR_VERSION=90
@@ -80,9 +71,6 @@ AC_SUBST([VTE_SEAL_CFLAGS])
 AC_SUBST([GTK_API_VERSION])
 AC_SUBST([VTE_LIBRARY_SUFFIX_U],[AS_TR_SH([$VTE_LIBRARY_SUFFIX])])
 
-AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
-AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
-
 ################################################################################
 
 # Check for programs
@@ -613,7 +601,7 @@ cat <<EOF | tee -a config.log
 ## Configuration. ##
 ## -------------- ##
 
-Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION
+Configuration for libvte-$VTE_API_VERSION $VERSION for gtk+-$GTK_API_VERSION
 	Installing Glade catalogue: $enable_glade_catalogue
 	Debugging: $DEBUG
 	Disallow deprecated features: $enable_deprecation