[vte] build: Add --with-gtk configure switch

[Christian Persch <chpe src gnome org>]

commit 42e3196a63b8ac3c5352986dec7d768dedaa2c0f
Author: Christian Persch <chpe src gnome org>
Date:   Wed Oct 12 21:24:06 2016 +0200

    build: Add --with-gtk configure switch
    
    Add --with-gtk configure switch to allow building with gtk+ 3.9?.
    Tested only in the --with-gtk=3.0 configuration.

 Makefile.am  |    2 +-
 configure.ac |   71 ++++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 55 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8a1649d..80d0b25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-vala \
        --enable-test-application \
        --disable-silent-rules \
-       --with-gtk=3.0
+       --with-gtk=$(GTK_API_VERSION)
 
 MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
diff --git a/configure.ac b/configure.ac
index f93982f..1ead5df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,32 +23,69 @@ fi
 AM_MAINTAINER_MODE([enable])
 
 ################################################################################
-# Libtool versioning
-################################################################################
-m4_define([lt_revision], m4_if(m4_eval(version_minor%2),1,0,version_micro))
-m4_define([lt_age], m4_eval(version_minor*100+version_micro-lt_revision))
-m4_define([lt_current], m4_eval(version_major+lt_age))
-m4_define([lt_triplet],lt_current:lt_revision:lt_age)
-
-LT_VERSION_INFO="lt_triplet()"
-AC_SUBST([LT_VERSION_INFO])
-
-################################################################################
 # GTK+
 ################################################################################
 
-VTE_API_MAJOR_VERSION=2
-VTE_API_MINOR_VERSION=91
+AC_MSG_CHECKING([which gtk+ version to compile against])
+AC_ARG_WITH([gtk],
+  [AS_HELP_STRING([--with-gtk=3.0|3.90],[which gtk+ version to compile against (default: 3.0)])],
+  [case "$with_gtk" in
+     3.0) ;;
+     3.9[02468]) ;;
+     2.0) AC_MSG_ERROR([unsupported gtk version $with_gtk specified]) ;;
+     *) AC_MSG_ERROR([invalid gtk version $with_gtk specified]) ;;
+   esac],
+  [with_gtk=3.0])
+AC_MSG_RESULT([$with_gtk])
+
+case "$with_gtk" in
+  3.0) GTK_API_VERSION=3.0
+       GTK_API_MAJOR_VERSION=3
+       GTK_API_MINOR_VERSION=0
+       GTK_REQUIRED=3.8.0
+       GTK_MIN_REQUIRED=3.8
+       GTK_MAX_ALLOWED=3.20
+       VTE_API_MAJOR_VERSION=2
+       VTE_API_MINOR_VERSION=91
+       GLADE_API_VERSION=2.0
+       ;;
+  3.9[02468]) GTK_API_VERSION=4.0
+              GTK_API_MAJOR_VERSION=4
+              GTK_API_MINOR_VERSION=0
+              GTK_REQUIRED=3.89.0
+              GTK_MIN_REQUIRED=3.8
+              GTK_MAX_ALLOWED=3.20
+              VTE_API_MAJOR_VERSION=3
+              VTE_API_MINOR_VERSION=91
+              # GLADE_API_VERSION=4.0 ?
+              # remove the following when they're ready
+              enable_glade_catalogue=no
+              enable_introspection=no
+              enable_vala=no
+              enable_test_application=no
+             ;;
+esac
+
 VTE_API_VERSION=$VTE_API_MAJOR_VERSION.$VTE_API_MINOR_VERSION
-GTK_API_VERSION=3.0
-GTK_REQUIRED=3.8.0
-GLADE_API_VERSION=2.0
 
 AC_SUBST([VTE_API_VERSION])
 AC_SUBST([VTE_API_VERSION_U],[AS_TR_SH([$VTE_API_VERSION])])
 AC_SUBST([VTE_API_MAJOR_VERSION])
 AC_SUBST([VTE_API_MINOR_VERSION])
 AC_SUBST([GTK_API_VERSION])
+AC_SUBST([GTK_API_MAJOR_VERSION])
+AC_SUBST([GTK_API_MINOR_VERSION])
+
+################################################################################
+# Libtool versioning
+################################################################################
+m4_define([lt_revision], m4_if(m4_eval(version_minor%2),1,0,version_micro))
+m4_define([lt_age], m4_eval(version_minor*100+version_micro-lt_revision))
+m4_define([lt_current], m4_eval(version_major+lt_age))
+m4_define([lt_triplet],lt_current:lt_revision:lt_age)
+
+LT_VERSION_INFO="lt_triplet()"
+AC_SUBST([LT_VERSION_INFO])
 
 ################################################################################
 
@@ -347,7 +384,7 @@ AM_PROG_VALAC([0.24.0],[],[
   fi])
 
 if test "$enable_test_application" = "yes"; then
-  PKG_CHECK_MODULES([GTK_3_16],[gtk+-3.0 >= 3.16],[have_gtk_3_16=yes],[have_gtk_3_16=no])
+  PKG_CHECK_MODULES([GTK_3_16],[gtk+-$GTK_API_VERSION >= 3.16],[have_gtk_3_16=yes],[have_gtk_3_16=no])
   AM_PROG_VALAC([0.31.1],[have_vala_0_31=yes],[have_vala_0_31=no])
 else
   have_gtk_3_16=no