From 80d37475904c9e58b8a291bcd6d49867dbf23506 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Sat, 1 Oct 2016 02:40:11 -0400 Subject: GTK3: port libunique->GtkApplication All GTK3 builds for now, this can go 3-way to permit gtk3/libunique builds if there is any reason for a distro to have issues with using GtkApplication, or for a point/buildfix release --- configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8dcb34f5..4b2df496 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,6 @@ case "$with_gtk" in GTK_REQUIRED=3.0.0 MATE_DESKTOP_REQUIRED=1.15.1 LIBCANBERRA_API_VERSION=3 - LIBUNIQUE_API_VERSION=3.0 ENGINES_FOLDER="theming-engines" APPINDICATOR_API_VERSION=3 ;; @@ -160,7 +159,13 @@ COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED" PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(MATECC, $COMMON_MODULES libmate-menu >= 1.1.0) -PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu unique-$LIBUNIQUE_API_VERSION) + +if test "$GTK_API_VERSION" = "3.0"; then + PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu) +else + PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu unique-$LIBUNIQUE_API_VERSION) +fi + PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1) PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= MATE_DESKTOP_REQUIRED) PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) -- cgit v1.2.1