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

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 5642a199d6acf7116768251a9bf85c9716958d2f (commit)
       from 0fa54615caeceb682a32eaf96ceb143aeea5c899 (commit)

commit 5642a199d6acf7116768251a9bf85c9716958d2f
Author: Nick Schermer <nick at xfce.org>
Date:   Wed May 12 21:50:23 2010 +0200

    Make build suitable for GIT.

 autogen.sh      |   18 ++++++++++++------
 configure.in.in |    6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index e7ad211..a56e5ce 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,13 +32,19 @@ 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}'`
+    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 0a411c3..f32b38e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -18,12 +18,12 @@ m4_define([libxfce4menu_version_micro], [1])
 m4_define([libxfce4menu_version_nano], [])
 m4_define([libxfce4menu_version_build], [r at REVISION@])
 m4_define([libxfce4menu_version_tag], [])
-m4_define([libxfce4menu_version], [libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(), [], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(), [svn], [libxfce4menu_version_tag()-libxfce4menu_version_build()], [libxfce4menu_version_tag()])])
+m4_define([libxfce4menu_version], [libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(), [], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(), [git], [libxfce4menu_version_tag()-libxfce4menu_version_build()], [libxfce4menu_version_tag()])])
 
 dnl ********************************************
-dnl *** Full debug support for SVN snapshots ***
+dnl *** Full debug support for GIT snapshots ***
 dnl ********************************************
-m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(), [svn], [full], [minimum])])
+m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(), [git], [full], [minimum])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***