Skip to content

Commit

Permalink
Config of gtk3 gui: Allow slightly lower minimum gtk3 version which s…
Browse files Browse the repository at this point in the history
…eems 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.
  • Loading branch information
cstim committed Feb 24, 2018
1 parent 210ec98 commit 66b2962
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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
8 changes: 3 additions & 5 deletions configure.ac
Expand Up @@ -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"
;;
Expand Down

0 comments on commit 66b2962

Please sign in to comment.