* configure.ac: Darwin's /bin/sh has a builtin echo that doesn't
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 27 Aug 2008 05:58:30 +0000 (05:58 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 27 Aug 2008 05:58:30 +0000 (05:58 +0000)
understand '-n'.  Use tr to trim the carriage return instead.

ChangeLog
configure.ac

index 134e3ea..6a2bf62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-27  David Shaw  <dshaw@jabberwocky.com>
+
+       * 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  <wk@g10code.com>
 
        * configure.ac: Call gl_HEADER_SYS_SOCKET and gl_TYPE_SOCKLEN_T.
index 7cf8bc5..e9332a5 100644 (file)
@@ -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])],
         [bug-gnupg@gnupg.org])