[svn] GnuPG - r4817 - trunk

svn author dshaw cvs at cvs.gnupg.org
Wed Aug 27 07:58:30 CEST 2008


Author: dshaw
Date: 2008-08-27 07:58:30 +0200 (Wed, 27 Aug 2008)
New Revision: 4817

Modified:
   trunk/ChangeLog
   trunk/configure.ac
Log:
* configure.ac: Darwin's /bin/sh has a builtin echo that doesn't
understand '-n'.  Use tr to trim the carriage return instead.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-19 19:36:42 UTC (rev 4816)
+++ trunk/ChangeLog	2008-08-27 05:58:30 UTC (rev 4817)
@@ -1,3 +1,8 @@
+2008-08-27  David Shaw  <dshaw at 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 at g10code.com>
 
 	* configure.ac: Call gl_HEADER_SYS_SOCKET and gl_TYPE_SOCKLEN_T.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-08-19 19:36:42 UTC (rev 4816)
+++ trunk/configure.ac	2008-08-27 05:58:30 UTC (rev 4817)
@@ -28,8 +28,9 @@
 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 at gnupg.org])




More information about the Gnupg-commits mailing list