[Xfce4-commits] [apps/xfce4-taskmanager] 02/02: Rework configure logic to build with Gtk+3 by default

[noreply at xfce.org]

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

l   a   n   d   r   y       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/xfce4-taskmanager.

commit 13c78d9738ba3b65ba0432bdbe8986f2510d784f
Author: Landry Breuil <landry at xfce.org>
Date:   Sun Jun 3 18:29:53 2018 +0200

    Rework configure logic to build with Gtk+3 by default
    
    Use --enable-gtk2 if you still want to build with the older toolkit, but
    the corresponding code might go away at some point....
---
 configure.ac.in | 22 +++++++++++-----------
 src/Makefile.am |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index af62ff3..88f2659 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -67,21 +67,21 @@ dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_LIBX11_REQUIRE()
 XDT_CHECK_PACKAGE([LIBXMU], [xmu], [1.1.2])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.5.0])
 
 dnl ***********************************
 dnl *** Check for optional packages ***
 dnl ***********************************
-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"])
-if test "x$GTK3_FOUND" = "xyes"; then
-	XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes])
-else
+XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
+                           [gtk+-2.0], [2.24.0], [gtk2],
+                           [GTK+ 2 support], [no])
+AM_CONDITIONAL([USE_GTK2], [test "x$GTK2_FOUND" = "xyes"])
+if test "x$GTK2_FOUND" = "xyes"; then
 	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])
+else
+	XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes])
 fi
 AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"])
 AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"])
@@ -165,10 +165,10 @@ echo
 echo "* Gksu:          ${GKSU_VERSION:-no}"
 echo "* Wnck:          ${WNCK_VERSION:-no}"
 echo "* Cairo:         ${CAIRO_VERSION}"
-if test "x$GTK3_FOUND" = "xyes" ; then
-echo "* GTK+:          ${GTK3_VERSION}"
+if test "x$GTK2_FOUND" = "xyes" ; then
+echo "* GTK+:          ${GTK2_VERSION}"
 else
-echo "* GTK+:          ${GTK_VERSION}"
+echo "* GTK+:          ${GTK3_VERSION}"
 fi
 echo "* Target OS:     $target_os ($ac_os_implementation)"
 echo "* Debug:         $enable_debug"
diff --git a/src/Makefile.am b/src/Makefile.am
index 32cfd39..448667c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,12 +36,12 @@ xfce4_taskmanager_SOURCES =						\
 	task-manager.c			task-manager.h			\
 	$(NULL)
 
-if USE_GTK3
+if USE_GTK2
+xfce4_taskmanager_LDADD +=	$(GTK2_LIBS) $(WNCK_LIBS)
+xfce4_taskmanager_CFLAGS +=	$(GTK2_CFLAGS) $(WNCK_CFLAGS)
+else
 xfce4_taskmanager_LDADD +=	$(GTK3_LIBS) $(WNCK_LIBS)
 xfce4_taskmanager_CFLAGS +=	$(GTK3_CFLAGS) $(WNCK_CFLAGS)
-else
-xfce4_taskmanager_LDADD +=	$(GTK_LIBS) $(WNCK_LIBS)
-xfce4_taskmanager_CFLAGS +=	$(GTK_CFLAGS) $(WNCK_CFLAGS)
 endif
 
 if HAVE_WNCK

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