From 5ec8b38b3706e5014316d17ddbf46b64e4bafc9b Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Wed, 23 Nov 2016 21:46:17 +0300
Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

and require mate-panel >= 1.17
---
 configure.ac | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index d670165..649f71d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # ================= initialization =================== #
 
-AC_INIT([MATE Sensors Applet], [1.16.0], [http://www.mate-desktop.org],
+AC_INIT([MATE Sensors Applet], [1.17.0], [http://www.mate-desktop.org],
 [mate-sensors-applet])
 
 AC_CONFIG_SRCDIR([sensors-applet/main.c])
@@ -48,39 +48,18 @@ AC_CHECK_HEADERS(
 )   
 
 GLIB_REQUIRED=2.36.0
-LIBPANEL_REQUIRED=1.1.0
+GTK_REQUIRED=3.14.0
+LIBPANEL_REQUIRED=1.17.0
 LIBNOTIFY_REQUIRED=0.7.0
 LIBCAIRO_REQUIRED=1.0.4
 LIBDBUSGLIB_REQUIRED=0.80
 LIBATASMART_REQUIRED=0.16
 
-# ================= GTK+ API version ================= #
-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)
-
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gio-2.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-- 
cgit v1.2.1