From ff7b62f84fff69a7d453c8dcf8503f4216b92126 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 8 Oct 2013 13:59:48 +0200 Subject: [PATCH] build: Use GTK+3 --- build/build.rules.mk | 4 ---- build/m4/sparkleshare/gtk-sharp.m4 | 15 +++------------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/build/build.rules.mk b/build/build.rules.mk index a0b75d55..0beed5c0 100755 --- a/build/build.rules.mk +++ b/build/build.rules.mk @@ -23,10 +23,6 @@ if ENABLE_TESTS ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" endif -if ENABLE_ATK - ENABLE_ATK_FLAG = "-define:ENABLE_ATK" -endif - FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE)) DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/') diff --git a/build/m4/sparkleshare/gtk-sharp.m4 b/build/m4/sparkleshare/gtk-sharp.m4 index 76077ed9..c8974902 100755 --- a/build/m4/sparkleshare/gtk-sharp.m4 +++ b/build/m4/sparkleshare/gtk-sharp.m4 @@ -1,23 +1,14 @@ AC_DEFUN([SPARKLESHARE_CHECK_GTK_SHARP], [ - GTKSHARP_REQUIRED=2.12.2 + GTKSHARP_REQUIRED=2.99.1 PKG_CHECK_MODULES(GTKSHARP, - gtk-sharp-2.0 >= $GTKSHARP_REQUIRED) + gtk-sharp-3.0 >= $GTKSHARP_REQUIRED) AC_SUBST(GTKSHARP_LIBS) PKG_CHECK_MODULES(GLIBSHARP, - glib-sharp-2.0 >= $GTKSHARP_REQUIRED) + glib-sharp-3.0 >= $GTKSHARP_REQUIRED) AC_SUBST(GLIBSHARP_LIBS) - PKG_CHECK_MODULES(GLIBSHARP_2_12_7, - glib-sharp-2.0 >= 2.12.7, - HAVE_GLIBSHARP_2_12_7=yes, - HAVE_GLIBSHARP_2_12_7=no) - AM_CONDITIONAL(HAVE_GLIBSHARP_2_12_7, [test "$HAVE_GLIBSHARP_2_12_7" = "yes"]) - - PKG_CHECK_MODULES(GTKSHARP_A11Y, gtk-sharp-2.0 >= 2.12.10, gtksharp_with_a11y=yes, gtksharp_with_a11y=no) - AM_CONDITIONAL(ENABLE_ATK, test "x$gtksharp_with_a11y" = "xyes") - ])