[Xfce4-commits] [apps/xfce4-taskmanager] 01/10: Only check for wnck3 if --enable-gtk3 was passed, and enable it by default then.

[noreply at xfce.org]

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

landry pushed a commit to branch landry/gtk3
in repository apps/xfce4-taskmanager.

commit 5310bb20d5c7b58fc783f75d7d574164bd5640c2
Author: Landry Breuil <landry at xfce.org>
Date:   Thu Dec 11 22:18:50 2014 +0100

    Only check for wnck3 if --enable-gtk3 was passed, and enable it by default then.
    
    Only check for wnck/gksu in the other case.
    This way one only needs --enable-gtk3 to switch.
---
 configure.ac.in |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d259d01..ff4ab12 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -71,17 +71,19 @@ XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.5.0])
 dnl ***********************************
 dnl *** Check for optional packages ***
 dnl ***********************************
-XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-1.0], [2.0], [wnck], [building with libwnck for window icons/names], [yes])
-AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"])
-XDT_CHECK_OPTIONAL_PACKAGE([GKSU], [libgksu2], [2.0], [gksu], [building with libgksu to run as root], [yes])
-AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"])
 XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
                            [gtk+-3.0], [3.2.0], [gtk3],
                            [GTK+ 3 support], [no])
 AM_CONDITIONAL([USE_GTK3], [test "x$GTK3_FOUND" = "xyes"])
-XDT_CHECK_OPTIONAL_PACKAGE([WNCK3], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [no])
-AM_CONDITIONAL([USE_WNCK3], [test x"$WNCK3_FOUND" = x"yes"])
-
+if test "x$GTK3_FOUND" = "xyes"; then
+	XDT_CHECK_OPTIONAL_PACKAGE([WNCK3], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes])
+else
+	XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-1.0], [2.0], [wnck], [building with libwnck for window icons/names], [yes])
+	XDT_CHECK_OPTIONAL_PACKAGE([GKSU], [libgksu2], [2.0], [gksu], [building with libgksu to run as root], [yes])
+fi
+AM_CONDITIONAL([HAVE_WNCK3], [test x"$WNCK3_FOUND" = x"yes"])
+AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"])
+AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"])
 dnl ***********************************
 dnl ********** Check for skel *********
 dnl ***********************************
@@ -155,7 +157,7 @@ echo
 echo "Build Configuration:"
 echo
 echo "* Gksu:          ${GKSU_VERSION:-no}"
-if test "x$WNCK3_FOUND" = "xyes" ; then
+if test "x$GTK3_FOUND" = "xyes" ; then
 echo "* Wnck:          ${WNCK3_VERSION:-no}"
 else
 echo "* Wnck:          ${WNCK_VERSION:-no}"

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