aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2008-08-27 05:58:30 +0000
committerDavid Shaw <[email protected]>2008-08-27 05:58:30 +0000
commiteb0b47b4220ddb8738df255c41ffd4301b148001 (patch)
tree2965e145ef1fbadaf017b480e1fc8c9bc2034891
parentAvoid passing NULL to printf while debugging. (diff)
downloadgnupg-eb0b47b4220ddb8738df255c41ffd4301b148001.tar.gz
gnupg-eb0b47b4220ddb8738df255c41ffd4301b148001.zip
* configure.ac: Darwin's /bin/sh has a builtin echo that doesn't
understand '-n'. Use tr to trim the carriage return instead.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 134e3eaa2..6a2bf62c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-27 David Shaw <[email protected]>
+
+ * configure.ac: Darwin's /bin/sh has a builtin echo that doesn't
+ understand '-n'. Use tr to trim the carriage return instead.
+
2008-04-23 Werner Koch <[email protected]>
* configure.ac: Call gl_HEADER_SYS_SOCKET and gl_TYPE_SOCKLEN_T.
diff --git a/configure.ac b/configure.ac
index 7cf8bc57d..e9332a5b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,9 @@ m4_define([my_version], [2.0.10])
m4_define([my_issvn], [yes])
-m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
- || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
+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']))
AC_INIT([gnupg],
[my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],