[X2Go-Commits] [x2gomatebindings] 03/06: configure.ac: make GTK version selectable.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gomatebindings.

commit be5376fb897044d78c66230fe30573c92ee28fee
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 11 03:01:43 2016 +0200

    configure.ac: make GTK version selectable.
---
 configure.ac     |   23 +++++++++++++++++++++--
 debian/changelog |    2 ++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index cc24ae0..e82004e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,17 +23,36 @@ fi
 dnl --------------------------------------------------
 
 GLIB_REQUIRED=2.4.0
-GTK_REQUIRED=2.4.0
 MATE_REQUIRED=1.6.0
 CAJA_EXTENSION=1.6.0
 GOBJECT_REQUIRED=2.4.0
 
+AC_MSG_CHECKING([GTK+ version])
+AC_ARG_WITH([gtk],
+  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+  [case "$with_gtk" in
+     2.0|3.0) ;;
+     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+   esac],
+  [with_gtk=2.0])
+AC_MSG_RESULT([$with_gtk])
+
+case "$with_gtk" in
+  2.0) GTK_API_VERSION=2.0
+       GTK_REQUIRED=2.4.0
+       ;;
+  3.0) GTK_API_VERSION=3.0
+       GTK_REQUIRED=3.0.0
+       ;;
+esac
+AC_SUBST(GTK_API_VERSION)
+
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
 
 PKG_CHECK_MODULES(CAJA_X2GOUMOUNT, \
 	 glib-2.0 >= $GLIB_REQUIRED \
-	 gtk+-2.0 >= $GTK_REQUIRED \
+	 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED \
 	 gmodule-2.0 >= $GLIB_REQUIRED \
 	 mate-desktop-2.0 >= $MATE_REQUIRED)
 
diff --git a/debian/changelog b/debian/changelog
index 7dd45e7..b35b64f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ x2gomatebindings (0.0.1.4-0~x2go1) UNRELEASED; urgency=low
       "Error: Package: x2gomatebinding ... Requires: or"
 
   [ Mihai Moldovan ]
+  * New upstream version (0.0.1.4):
+    - configure.ac: make GTK version selectable.
   * x2gomatebindings.spec:
     - Add run and build time dependency: filesystem.
     - Only own files, do not blindly own complete (and alien!) directories.

--
Alioth's /srv/git/code.x2go.org/x2gomatebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gomatebindings.git