From 872b863579938da1e014f279d3de10e3888c41f1 Mon Sep 17 00:00:00 2001 From: Olivier Duchateau Date: Wed, 9 Aug 2017 17:36:06 +0200 Subject: [PATCH] Check if Clutter supports GDK backend (not yet in FreeBSD). --- configure.ac.in | 10 +++++++++- libxfdashboard/Makefile.am | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 617c40f..ef05275 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -201,7 +201,6 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [wnck_minimum_version]) -XDT_CHECK_PACKAGE([CLUTTER], [clutter-1.0], [clutter_minimum_version]) XDT_CHECK_PACKAGE([CLUTTER_COGL], [clutter-cogl-1.0], [clutter_minimum_version]) XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [gtk_minimum_version]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version]) @@ -220,6 +219,15 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version], [ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL)]) +dnl ********************************************** +dnl *** Check for Clutter and its backend: GDK *** +dnl ********************************************** +XDT_CHECK_PACKAGE([CLUTTER], [clutter-1.0], [clutter_minimum_version], [ + XDT_CHECK_PACKAGE([CLUTTER_GDK], [clutter-gdk-1.0], [clutter_minimum_version], + [ac_clutter_gdk=yes], [ac_clutter_gdk=no])] +) +AM_CONDITIONAL([GDK], [test x"$ac_clutter_gdk" = x"yes"]) + dnl *********************************** dnl *** Check for debugging support *** dnl *********************************** diff --git a/libxfdashboard/Makefile.am b/libxfdashboard/Makefile.am index 6100dde..ca07480 100644 --- a/libxfdashboard/Makefile.am +++ b/libxfdashboard/Makefile.am @@ -253,12 +253,21 @@ endif gdk_headers = \ gdk/window-tracker-backend-gdk.h +libxfdashboard_la_headers += $(gdk_headers) + +if GDK gdk_sources = \ gdk/window-tracker-backend-gdk.c -libxfdashboard_la_headers += $(gdk_headers) libxfdashboard_la_SOURCES += $(gdk_sources) +libxfdashboard_la_CFLAGS += \ + $(CLUTTER_GDK_CFLAGS) + +libxfdashboard_la_LIBADD += \ + $(CLUTTER_GDK_LIBS) +endif + libxfdashboard_la_includedir = \ $(includedir)/xfdashboard/libxfdashboard -- 2.9.4