summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-05-26 16:53:00 +0300
committermonsta <[email protected]>2016-05-26 16:53:00 +0300
commit8195dc9b0e609733ae76d2da7201fe1bd73c7d2d (patch)
treebe637606c8e2d7c3e12779377f607fdddfcb6007
parent2d2dab52b25b32ad0fb8efc1d2e279fbd5e1955b (diff)
downloadmate-terminal-8195dc9b0e609733ae76d2da7201fe1bd73c7d2d.tar.bz2
mate-terminal-8195dc9b0e609733ae76d2da7201fe1bd73c7d2d.tar.xz
require GTK+ 3.14 and VTE 0.38 (API 2.91), drop --with-gtk option
-rw-r--r--configure.ac31
1 files changed, 4 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index 690d538..085c08e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,39 +46,16 @@ AM_GLIB_GNU_GETTEXT
GLIB_REQUIRED=2.36.0
GIO_REQUIRED=2.25.12
+GTK_REQUIRED=3.14.0
+VTE_REQUIRED=0.38
DCONF_REQUIRED=0.13.4
-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)])],
- [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.24.0
- GDK_TARGETS="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
- VTE_REQUIRED=0.28
- VTE_PC_VERSION=
- ;;
- 3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=3.0.0
- GDK_TARGETS="$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)"
- VTE_REQUIRED=0.38
- VTE_PC_VERSION=-2.91
- ;;
-esac
-
PKG_CHECK_MODULES([TERM],
- [vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ [vte-2.91 >= $VTE_REQUIRED
glib-2.0 >= $GLIB_REQUIRED
gthread-2.0
gio-2.0 >= $GIO_REQUIRED
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gtk+-3.0 >= $GTK_REQUIRED
dconf >= $DCONF_REQUIRED
x11])