[gnome-break-timer] Remove unnecessary GTK version check
- From: Dylan McCall <dylanmccall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-break-timer] Remove unnecessary GTK version check
- Date: Sun, 31 Aug 2014 01:27:41 +0000 (UTC)
commit 63778053372025afd42233c91f186ec65baa93df
Author: Dylan McCall <dylanmccall ubuntu com>
Date: Sat Aug 30 18:22:24 2014 -0700
Remove unnecessary GTK version check
base.am | 4 ----
configure.ac | 8 +-------
2 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/base.am b/base.am
index b25e194..861c128 100644
--- a/base.am
+++ b/base.am
@@ -17,10 +17,6 @@ VALAFLAGS = \
--target-glib=2.36.0 \
$(addprefix --vapidir ,$(HELPER_LIB_PATHS))
-if HAS_GTK_3_10
-VALAFLAGS += -D HAS_GTK_3_10
-endif
-
# Run all tests in CWD and subdirs
# Borrowed from libgee
diff --git a/configure.ac b/configure.ac
index 5d5ce67..640ea7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,6 @@ AC_SUBST(LDFLAGS)
GLIB_REQUIRED=2.36.0
GTK_REQUIRED=3.10.0
-GTK_RECOMMENDED=3.10.0
PKG_CHECK_MODULES([CFG_CORE], [
glib-2.0 >= $GLIB_REQUIRED
@@ -62,18 +61,13 @@ PKG_CHECK_MODULES([CFG_ACTIVITY_MONITOR_BACKEND], [
])
PKG_CHECK_MODULES(
- [CFG_GTK], [gtk+-3.0 >= $GTK_RECOMMENDED], [GTK_MIN_VERSION=3.10],
- [PKG_CHECK_MODULES(
- [CFG_GTK], [gtk+-3.0 >= $GTK_REQUIRED], [GTK_MIN_VERSION=3.8]
- )]
+ [CFG_GTK], [gtk+-3.0 >= $GTK_REQUIRED], [GTK_MIN_VERSION=3.10]
)
# Some helpful constants that are available to the application
-AM_CONDITIONAL([HAS_GTK_3_10], [test $GTK_MIN_VERSION = 3.10])
-
AC_DEFINE(SETTINGS_DESKTOP_ID, "gnome-break-timer.desktop", [Name of the .desktop file used for the settings
application])
AC_DEFINE(HELPER_DESKTOP_ID, "gnome-break-timer-service.desktop", [Name of the .desktop file used for the
helper service])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]