aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2008-08-27 16:57:45 +0000
committerDavid Shaw <[email protected]>2008-08-27 16:57:45 +0000
commit42d887c025e5010aecd3ca393e3d33e402368fd9 (patch)
treee67c0f33b7adb2bc71cba294ad9702b5643b54d2
parentFix possible NULL argument to printf (diff)
downloadgnupg-42d887c025e5010aecd3ca393e3d33e402368fd9.tar.gz
gnupg-42d887c025e5010aecd3ca393e3d33e402368fd9.zip
* configure.ac: Use printf for the most portable SVN version
detection.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 50e78f9a4..df4bce620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-27 David Shaw <[email protected]>
+
+ * configure.ac: Use printf for the most portable SVN version
+ detection.
+
2008-08-11 Werner Koch <[email protected]>
* configure.ac: Check for size of time_t.
diff --git a/configure.ac b/configure.ac
index 19afbaedb..03043e709 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,8 @@ min_automake_version="1.9.3"
# "svn up" and "autogen.sh --force" right before creating a distribution.
m4_define([my_version], [1.4.10])
m4_define([my_issvn], [yes])
-
-m4_define([svn_revision], m4_esyscmd([echo $((svn info 2>/dev/null \
- || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)| \
- tr -d '\n']))
+m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
+ | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gnupg],
[my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],