[Xfce4-commits] r23790 - xfdesktop/trunk
Brian J. Tarricone
bjt23 at cornell.edu
Thu Nov 9 09:11:02 CET 2006
Hey guys,
This is kinda a simple silly thing, but would likely make matters easier
for the release manager du jour when we do releases. If people have
time, might want to do the same as I've done below for their packages.
Just a friendly suggestion, feel free to ignore if you don't care ^_^
-brian
Brian Tarricone wrote:
> Author: kelnos
> Date: 2006-11-09 07:47:52 +0000 (Thu, 09 Nov 2006)
> New Revision: 23790
>
> Modified:
> xfdesktop/trunk/configure.ac.in
> Log:
> * add a verbose warning message when dbus or thunar-vfs can't be found
> (bug 2522)
> * move all required version numbers to the top of configure.ac.in to make
> changing them easy
>
>
> Modified: xfdesktop/trunk/configure.ac.in
> ===================================================================
> --- xfdesktop/trunk/configure.ac.in 2006-11-08 22:11:08 UTC (rev 23789)
> +++ xfdesktop/trunk/configure.ac.in 2006-11-09 07:47:52 UTC (rev 23790)
> @@ -6,6 +6,13 @@
> dnl version info
> m4_define([xfdesktop_version], [4.3.99.2])
>
> +dnl minimum required versions
> +m4_define([gtk_minimum_version], [2.6.0])
> +m4_define([xfce_minimum_version], [4.3.99.2])
> +m4_define([exo_minimum_version], [0.3.1.12])
> +m4_define([thunar_minimum_version], [0.5.0])
> +m4_define([dbus_minimum_version], [0.34])
> +
> dnl init autoconf
> AC_INIT([xfdesktop], [xfdesktop_version], [bjt23 at cornell.edu])
> AC_PREREQ([2.50])
> @@ -43,13 +50,14 @@
> XDT_CHECK_LIBSM
>
> dnl required
> -XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.6.0])
> -XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
> -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
> -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
> -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
> -XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.3.99.2])
> -XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.3.99.2])
> +XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [gtk_minimum_version])
> +XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [gtk_minimum_version])
> +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
> +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version])
> +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version])
> +XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0],
> + [xfce_minimum_version])
> +XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [xfce_minimum_version])
>
> dnl do we want desktop icons at all?
> AC_ARG_ENABLE([desktop-icons],
> @@ -79,8 +87,21 @@
>
> if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
> dnl here i shall abuse the XDT_CHECK_PACKAGE macro
> - XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.5.0], [], [true])
> - XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.34], [], [true])
> + XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1],
> + [thunar_minimum_version], [], [
> +echo "*** Optional package thunar-vfs-1 was either not found on your system"
> +echo "*** or is too old. Please install or upgrade to at least version"
> +echo "*** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
> +echo "*** if you installed the new version of the package in a nonstandard"
> +echo "*** prefix. File/launcher icons will be disabled."
> +])
> + XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
> +echo "*** Optional package dbus-glib-1 was either not found on your system"
> +echo "*** or is too old. Please install or upgrade to at least version"
> +echo "*** dbus_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
> +echo "*** if you installed the new version of the package in a nonstandard"
> +echo "*** prefix. File/launcher icons will be disabled."
> +])
> if test "x$THUNAR_VFS_VERSION" != "x" -a "x$DBUS_VERSION" != "x"; then
> AC_DEFINE([ENABLE_FILE_ICONS], [1],
> [Define if file icons should be enabled])
> @@ -95,9 +116,10 @@
> dnl i'd rather have these two only checked conditionally, but this macro also
> dnl calls AM_CONDITIONAL(), which cannot be in an 'if' block
>
> -XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-1], [0.5.0], [thunarx],
> +XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-1], [thunar_minimum_version],
> + [thunarx],
> [Whether to use Thunar's extension mechanism to add external features to the desktop icon implementation])
> -XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.12], [exo],
> +XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-0.3], [exo_minimum_version], [exo],
> [Whether to use libexo for nifty icon effects])
>
> AC_ARG_ENABLE([menu-editor],
> @@ -136,7 +158,8 @@
> build_panel_plugin="no"
> else
> build_panel_plugin="yes"
> - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
> + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0],
> + [xfce_minimum_version])
> fi
> AM_CONDITIONAL([BUILD_PANEL_PLUGIN], [test "x$build_panel_plugin" = "xyes"])
>
>
> _______________________________________________
> Xfce4-commits mailing list
> Xfce4-commits at xfce.org
> http://foo-projects.org/mailman/listinfo/xfce4-commits
>
More information about the Xfce4-dev
mailing list