summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-20 14:28:35 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-20 14:28:35 +0000
commite86c5e7b1dbab7a7c0a497ca9cedaa352c745519 (patch)
tree4491e23ece289c4cfe2ab724707a3aef3b6cb828
parent2f0c71fb04ca455066391e38aaed9f5e3b9f3202 (diff)
ef: 1.7.1 release.v1.7.1
SVN revision: 78286
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aefb8a6..683a777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,3 +122,7 @@
1222012-08-30 Carsten Haitzler (The Rasterman) 1222012-08-30 Carsten Haitzler (The Rasterman)
123 123
124 1.7.0 release 124 1.7.0 release
125
1262012-10-20 Cedric Bail
127
128 1.7.1 release
diff --git a/configure.ac b/configure.ac
index 5569970..fe69563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [1])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line