From 66b2962697ec747366efd00914c56edc091df46a Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 24 Feb 2018 23:28:13 +0100 Subject: [PATCH] Config of gtk3 gui: Allow slightly lower minimum gtk3 version which seems to compile fine. Also, if gtk3 is not found, really stop the config as otherwise we will have missing GTK3_INCLUDE flags. Also, let travis build this gui as well. --- .travis.yml | 2 +- configure.ac | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7f64f17..0a407e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ before_install: - sudo apt-get install libgnutls-dev libgtk-3-dev libgtk2.0-dev script: - make -f Makefile.cvs - - ./configure --with-guis="qt4 gtk2" + - ./configure --with-guis="qt4 gtk2 gtk3" - make - make test diff --git a/configure.ac b/configure.ac index 123e9941..9bab3d2d 100644 --- a/configure.ac +++ b/configure.ac @@ -898,11 +898,9 @@ AM_CONDITIONAL(WITH_GUI_GTK2, [test "$with_gui_gtk2" = "yes"]) case "$gwenhywfar_guis" in *gtk3*) - # We need at least GTK 2.17.5 because we use functions like - # gtk_widget_get_sensitive() and gtk_widget_has_focus() - pkg_modules="gtk+-3.0 >= 3.14.0" - dnl $4=true => don't die in case of failure. - PKG_CHECK_MODULES(GTK3, [$pkg_modules], [], true) + # Minimum required gtk3 version + pkg_modules="gtk+-3.0 >= 3.10.8" + PKG_CHECK_MODULES(GTK3, [$pkg_modules]) AC_DEFINE(BUILD_GUI_GTK3, 1, [if gwen gui for gtk3 is built]) with_gui_gtk3="yes" ;;