Reuse the same WNCK autoconf/automake macro, makes window icons working again with gtk3
This commit is contained in:
@@ -76,12 +76,11 @@ XDT_CHECK_OPTIONAL_PACKAGE([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([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
|
||||
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 ***********************************
|
||||
@@ -157,11 +156,7 @@ echo
|
||||
echo "Build Configuration:"
|
||||
echo
|
||||
echo "* Gksu: ${GKSU_VERSION:-no}"
|
||||
if test "x$GTK3_FOUND" = "xyes" ; then
|
||||
echo "* Wnck: ${WNCK3_VERSION:-no}"
|
||||
else
|
||||
echo "* Wnck: ${WNCK_VERSION:-no}"
|
||||
fi
|
||||
echo "* Cairo: ${CAIRO_VERSION}"
|
||||
if test "x$GTK3_FOUND" = "xyes" ; then
|
||||
echo "* GTK+: ${GTK3_VERSION}"
|
||||
|
||||
Reference in New Issue
Block a user