summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-12-13 11:32:51 +0300
committermonsta <[email protected]>2016-12-13 11:32:51 +0300
commitf2aa4cd5009a2766674ae02d2cc4f5e4fddb4079 (patch)
tree78fac7f8ae47c76c41195586ff7ec9bb10924ae6 /configure.ac
parentb4ddcc1d1f7635d19db4b015a54b45dca63e2c88 (diff)
downloadlibmateweather-f2aa4cd5009a2766674ae02d2cc4f5e4fddb4079.tar.bz2
libmateweather-f2aa4cd5009a2766674ae02d2cc4f5e4fddb4079.tar.xz
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac24
1 files changed, 2 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index 9bcb32e..81d1500 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,27 +21,8 @@ AC_SUBST(LT_VERSION)
AC_CANONICAL_HOST
-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
- ;;
- 3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=3.0.0
- ;;
-esac
-AC_SUBST(GTK_API_VERSION)
-
GLIB_REQUIRED=2.36.0
+GTK_REQUIRED=3.14.0
LIBSOUP_REQUIRED=2.34.0
GIO_REQUIRED=2.25.0
LIBXML_REQUIRED=2.6.0
@@ -80,7 +61,7 @@ AC_SUBST(COMPRESS_EXT)
MATE_COMPILE_WARNINGS([maximum])
dnl -- Check for GTK+ (required) ------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
dnl -- Check for libxml (required) ------------------------------------------
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED)
@@ -216,5 +197,4 @@ libmateweather-$VERSION configure summary:
Compiler: ${CC}
Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
Locations.xml compression: ${enable_locations_compression}
- Gtk+ version: ${GTK_API_VERSION}
" >&2