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

Rework configure logic to build with Gtk+3 by default

Browse Source 
Use --enable-gtk2 if you still want to build with the older toolkit, but
the corresponding code might go away at some point....
This commit is contained in:
Landry Breuil
2018-06-03 18:29:53 +02:00
parent cd7b6e2d51
commit 13c78d9738
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac.in
View File

@@ -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"