FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reuse the same WNCK autoconf/automake macro, makes window icons working again with gtk3

Browse Source
This commit is contained in:
Landry Breuil
2014-12-17 21:43:44 +01:00
parent 54679d82d9
commit 92b48c3d5d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac.in
View File

@@ -76,12 +76,11 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
[GTK+ 3 support], [no]) [GTK+ 3 support], [no])
AM_CONDITIONAL([USE_GTK3], [test "x$GTK3_FOUND" = "xyes"]) AM_CONDITIONAL([USE_GTK3], [test "x$GTK3_FOUND" = "xyes"])
if test "x$GTK3_FOUND" = "xyes"; then 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]) XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-3.0], [3.2], [wnck3], [building with libwnck3 for window icons/names], [yes])
else else
XDT_CHECK_OPTIONAL_PACKAGE([WNCK], [libwnck-1.0], [2.0], [wnck], [building with libwnck for window icons/names], [yes]) 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]) XDT_CHECK_OPTIONAL_PACKAGE([GKSU], [libgksu2], [2.0], [gksu], [building with libgksu to run as root], [yes])
fi fi
AM_CONDITIONAL([HAVE_WNCK3], [test x"$WNCK3_FOUND" = x"yes"])
AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"]) AM_CONDITIONAL([HAVE_WNCK], [test x"$WNCK_FOUND" = x"yes"])
AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"]) AM_CONDITIONAL([HAVE_GKSU], [test x"$GKSU_FOUND" = x"yes"])
dnl *********************************** dnl ***********************************
@@ -157,11 +156,7 @@ echo
echo "Build Configuration:" echo "Build Configuration:"
echo echo
echo "* Gksu: ${GKSU_VERSION:-no}" echo "* Gksu: ${GKSU_VERSION:-no}"
if test "x$GTK3_FOUND" = "xyes" ; then
echo "* Wnck: ${WNCK3_VERSION:-no}"
else
echo "* Wnck: ${WNCK_VERSION:-no}" echo "* Wnck: ${WNCK_VERSION:-no}"
fi
echo "* Cairo: ${CAIRO_VERSION}" echo "* Cairo: ${CAIRO_VERSION}"
if test "x$GTK3_FOUND" = "xyes" ; then if test "x$GTK3_FOUND" = "xyes" ; then
echo "* GTK+: ${GTK3_VERSION}" echo "* GTK+: ${GTK3_VERSION}"

4
src/Makefile.am
View File

@@ -33,8 +33,8 @@ xfce4_taskmanager_SOURCES = \
$(NULL) $(NULL)
if USE_GTK3 if USE_GTK3
xfce4_taskmanager_LDADD += $(GTK3_LIBS) $(WNCK3_LIBS) xfce4_taskmanager_LDADD += $(GTK3_LIBS) $(WNCK_LIBS)
xfce4_taskmanager_CFLAGS += $(GTK3_CFLAGS) $(WNCK3_CFLAGS) xfce4_taskmanager_CFLAGS += $(GTK3_CFLAGS) $(WNCK_CFLAGS)
else else
xfce4_taskmanager_LDADD += $(GTK_LIBS) $(WNCK_LIBS) xfce4_taskmanager_LDADD += $(GTK_LIBS) $(WNCK_LIBS)
xfce4_taskmanager_CFLAGS += $(GTK_CFLAGS) $(WNCK_CFLAGS) xfce4_taskmanager_CFLAGS += $(GTK_CFLAGS) $(WNCK_CFLAGS)