summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xautogen.sh9
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b40ebe338..328270d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-04 19:24 jannis
+
+ * autogen.sh: Add git svn revision versioning support.
+
2007-11-06 22:53 olivier
* src/events.c: Revert to current time for releasing queued input
diff --git a/autogen.sh b/autogen.sh
index ea1f7d6a8..a6f77eb3c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,14 @@ echo "Creating configure.ac"
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
-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`
+else
+ revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+fi
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
< "configure.ac.in" > "configure.ac"