[Xfce4-commits] <xfce4-session:master> Update to use git and new macros.

[Nick Schermer]

Updating branch refs/heads/master
         to ad65e5f6ec29d79f8e4f9ff75a186b01dd318696 (commit)
       from 121cdb77d44500963fdcbf0f9f675980294b42ff (commit)

commit ad65e5f6ec29d79f8e4f9ff75a186b01dd318696
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Jan 28 21:50:55 2010 +0100

    Update to use git and new macros.
    
    Also bump version to 4.7.0git and silence the build.

 configure.in.in |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index d74a9ba..a1eb10a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,12 +8,14 @@ dnl
 
 dnl Version information
 m4_define([xfsm_version_major], [4])
-m4_define([xfsm_version_minor], [6])
-m4_define([xfsm_version_micro], [1])
-m4_define([xfsm_version_nano], [])
+m4_define([xfsm_version_minor], [7])
+m4_define([xfsm_version_micro], [0])
+m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version
 m4_define([xfsm_version_build], [@REVISION@])
-m4_define([xfsm_version_tag], [])
-m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [svn], [xfsm_version_tag()[-r]xfsm_version_build()], [])])
+m4_define([xfsm_version_tag], [git])
+m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])])
+
+m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])])
 
 dnl Initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2003-2009
@@ -29,6 +31,7 @@ dnl Initialize automake
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl check for UNIX variants
 AC_USE_SYSTEM_EXTENSIONS
@@ -69,13 +72,13 @@ dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 
 dnl Check for required packages
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.6.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
-XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
 dnl we provide a panel plugin now
 XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0],
@@ -96,7 +99,10 @@ XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22],
                            [Extra gnome-keyring compatibility support], [no])
 
 dnl Check for debugging support
-BM_DEBUG_SUPPORT()
+XDT_FEATURE_DEBUG([xfsm_debug_default])
+
+dnl Check for linker optimizations
+XDT_FEATURE_LINKER_OPTS()
 
 dnl Check for iceauth
 AC_PATH_PROG([ICEAUTH], [iceauth])