[Xfce4-commits] <squeeze:master> Switched to Xfce dev tools 4.8.0

[Peter de Ridder]

Updating branch refs/heads/master
         to 2ae085df0ab2408936240d3680439092250ca8e5 (commit)
       from d37bdd22e69608db7fd67571ad1b48012c27cc82 (commit)

commit 2ae085df0ab2408936240d3680439092250ca8e5
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Aug 21 01:25:37 2011 +0200

    Switched to Xfce dev tools 4.8.0

 autogen.sh      |   26 ++++++--------------------
 configure.in.in |   14 ++++++++------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index f370893..1030820 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,33 +7,19 @@
 #
 # Written for Xfce by Benedikt Meurer <benny at xfce.org>.
 #
+XDT_REQURED_VERSION="4.8.0"
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
-            your system, which are required to build this software.
-            Please install the xfce4-dev-tools package first, it is available
+autogen.sh: You don't seem to have the Xfce development tools (at least
+            version $XDT_REQURED_VERSION) installed on your system, which
+            are required to build this software.
+            Please install the xfce4-dev-tools package first; it is available
             from http://www.xfce.org/.
 EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION=$XDT_REQURED_VERSION exec xdt-autogen "$@"
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index fdaa366..a647a87 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,14 +15,14 @@ m4_define([squeeze_version_major], [0])
 m4_define([squeeze_version_minor], [4])
 m4_define([squeeze_version_micro], [90])
 m4_define([squeeze_version_nano], []) # Leave empty for no nano version
-m4_define([squeeze_version_build], [r at REVISION@])
-m4_define([squeeze_version_tag], [svn]) # Leave empty for releases
-m4_define([squeeze_version], [ifelse(squeeze_version_branch(), [], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_nano(), [], [], [.squeeze_version_nano()])], [squeeze_version_branch()])ifelse(squeeze_version_tag(),[],[], [-ifelse(squeeze_version_tag(), [dev], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])])])
+m4_define([squeeze_version_build], [@REVISION@])
+m4_define([squeeze_version_tag], [git]) # Leave empty for releases
+m4_define([squeeze_version], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_tag(), [], [], [squeeze_version_tag()-squeeze_version_build()])])
 
 dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for GIT snapshots ***
 dnl *******************************************
-m4_define([squeeze_debug_default], [ifelse(squeeze_version_tag(), [svn], [full], [no])])
+m4_define([squeeze_debug_default], [ifelse(squeeze_version_tag(), [git], [yes], [])])
 
 AC_COPYRIGHT([Copyright (c) 2006
         The Xfce development team. All rights reserved.
@@ -137,7 +137,9 @@ if test "$lsq_gslices" = "yes"; then
 fi
 
 dnl check for debugging support
-XDT_FEATURE_DEBUG
+XDT_FEATURE_DEBUG([squeeze_debug_default])
+
+XDT_FEATURE_LINKER_OPTS
 
 AC_OUTPUT([
 Makefile