[Xfce4-commits] [apps/xfdashboard] 01/01: Fix building list of libraries depending on when checking for Clutter version and its supported backend

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

n   o   m   a   d       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfdashboard.

commit 1fb678329b4aeff5e8cabb7458eefa7e3670a0ca
Author: Stephan Haller <nomad at froevel.de>
Date:   Mon Sep 18 16:15:07 2017 +0200

    Fix building list of libraries depending on when checking for Clutter version and its supported backend
    
    Fixes bug #13860
---
 configure.ac.in | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index c74fb59..38169cf 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -235,23 +235,19 @@ AM_CONDITIONAL([DBUS_GLIB], [test x"$ac_dbus_glib" = x"yes"])
 dnl **********************************************
 dnl *** Check for Clutter and its backend: GDK ***
 dnl **********************************************
-XDT_CHECK_PACKAGE([CLUTTER], [clutter-1.0], [clutter_minimum_version], [XFDASHBOARD_REQUIRES="$XFDASHBOARD_REQUIRES clutter-1.0 clutter-gdk-1.0"])
-XDT_CHECK_PACKAGE([CLUTTER_COGL], [clutter-cogl-1.0], [clutter_minimum_version], [XFDASHBOARD_REQUIRES="$XFDASHBOARD_REQUIRES clutter-cogl-1.0"])
-
-dnl **********************************************
-dnl *** Check for Clutter and its backend: GDK ***
-dnl **********************************************
 BACKENDS="x11"
 
 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])]
+	XFDASHBOARD_REQUIRES="$XFDASHBOARD_REQUIRES clutter-1.0"
+	XDT_CHECK_PACKAGE([CLUTTER_COGL], [clutter-cogl-1.0], [clutter_minimum_version], [XFDASHBOARD_REQUIRES="$XFDASHBOARD_REQUIRES clutter-cogl-1.0"])
+	XDT_CHECK_PACKAGE([CLUTTER_GDK], [clutter-gdk-1.0], [clutter_minimum_version], [ac_clutter_gdk=yes], [ac_clutter_gdk=no])]
 )
 
 HAVE_BACKEND_GDK=""
 AM_CONDITIONAL([XFDASHBOARD_BUILD_WITH_BACKEND_GDK], [test x"$ac_clutter_gdk" = x"yes"])
 if test "x$ac_clutter_gdk" = xyes; then
 	BACKENDS="$BACKENDS gdk"
+	XFDASHBOARD_REQUIRES="$XFDASHBOARD_REQUIRES clutter-gdk-1.0"
 	AC_DEFINE([HAVE_BACKEND_GDK], [1], [Define if GDK backend is available])
 fi
 AC_SUBST(HAVE_BACKEND_GDK)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.