build: Use GTK+3
This commit is contained in:
parent
c1ed43e6c9
commit
3036b3a248
|
@ -23,10 +23,6 @@ if ENABLE_TESTS
|
||||||
ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
|
ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ENABLE_ATK
|
|
||||||
ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
|
|
||||||
endif
|
|
||||||
|
|
||||||
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
|
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
|
||||||
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
|
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
|
||||||
|
|
||||||
|
|
|
@ -1,23 +1,14 @@
|
||||||
AC_DEFUN([SPARKLESHARE_CHECK_GTK_SHARP],
|
AC_DEFUN([SPARKLESHARE_CHECK_GTK_SHARP],
|
||||||
[
|
[
|
||||||
GTKSHARP_REQUIRED=2.12.2
|
GTKSHARP_REQUIRED=2.99.1
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GTKSHARP,
|
PKG_CHECK_MODULES(GTKSHARP,
|
||||||
gtk-sharp-2.0 >= $GTKSHARP_REQUIRED)
|
gtk-sharp-3.0 >= $GTKSHARP_REQUIRED)
|
||||||
AC_SUBST(GTKSHARP_LIBS)
|
AC_SUBST(GTKSHARP_LIBS)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GLIBSHARP,
|
PKG_CHECK_MODULES(GLIBSHARP,
|
||||||
glib-sharp-2.0 >= $GTKSHARP_REQUIRED)
|
glib-sharp-3.0 >= $GTKSHARP_REQUIRED)
|
||||||
AC_SUBST(GLIBSHARP_LIBS)
|
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")
|
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue