[Xfce4-commits] <libxfce4util:xfce-4.6> Make build suitable for GIT.

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 09b6da9e06864e9661e67cc507eac822988eabdd (commit)
       from 7e797082fabf184705735507746880119eb89302 (commit)

commit 09b6da9e06864e9661e67cc507eac822988eabdd
Author: Nick Schermer <nick at xfce.org>
Date:   Wed May 12 22:12:11 2010 +0200

    Make build suitable for GIT.

 autogen.sh      |   20 +++++++++++++-------
 configure.in.in |    8 ++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6be74d7..1e4b69d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,14 +29,20 @@ EOF
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then 
-  revision=`git svn find-rev trunk 2>/dev/null ||
-            git svn find-rev origin/trunk 2>/dev/null ||
-            git svn find-rev HEAD 2>/dev/null ||
-            git svn find-rev master 2>/dev/null`
-else
-  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+if test -d .git/svn; then
+    revision=`git svn find-rev trunk 2>/dev/null ||
+              git svn find-rev origin/trunk 2>/dev/null ||
+              git svn find-rev HEAD 2>/dev/null ||
+              git svn find-rev master 2>/dev/null`
+elif test -d .git; then
+    revision=`git rev-parse --short HEAD`
+elif test -d .svn; then
+    revision=`LC_ALL=C svn info $0 | $AWK '/^Revision: / {printf "%05d\n", $2}'`
 fi
+if test "x$revision" = "x"; then
+    revision="UNKNOWN"
+fi
+
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
diff --git a/configure.in.in b/configure.in.in
index 9a19fce..d044ede 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,9 +15,9 @@ m4_define([libxfce4util_version_major], [4])
 m4_define([libxfce4util_version_minor], [6])
 m4_define([libxfce4util_version_micro], [1])
 m4_define([libxfce4util_version_nano], [])   dnl leave this empty to have no nano version
-m4_define([libxfce4util_version_build], [r at REVISION@])
+m4_define([libxfce4util_version_build], [@REVISION@])
 m4_define([libxfce4util_version_tag], [])
-m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [svn], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
+m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
 
 dnl **************************************************************
 dnl *** Overall Xfce version, modify this when making releases ***
@@ -30,9 +30,9 @@ dnl # YOU ARE DOING.
 
 
 dnl ********************************************
-dnl *** Full debug support for SVN snapshots ***
+dnl *** Full debug support for GIT snapshots ***
 dnl ********************************************
-m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [svn], [full], [minimum])])
+m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [git], [full], [minimum])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***