[svn] GnuPG - r4706 - branches/STABLE-BRANCH-1-4

[svn author dshaw]

Author: dshaw
Date: 2008-03-07 20:08:31 +0100 (Fri, 07 Mar 2008)
New Revision: 4706

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/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: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2008-03-06 18:28:47 UTC (rev 4705)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2008-03-07 19:08:31 UTC (rev 4706)
@@ -1,3 +1,8 @@
+2008-03-07  David Shaw  <dshaw at david-shaws-mac-pro.local>
+
+	* configure.ac: Darwin's /bin/sh has a builtin echo that doesn't
+	understand '-n'.  Use tr to trim the carriage return instead.
+
 2008-03-06  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Post-release update.

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2008-03-06 18:28:47 UTC (rev 4705)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2008-03-07 19:08:31 UTC (rev 4706)
@@ -1,6 +1,6 @@
 # configure.ac script for GnuPG
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-#               2007 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+#               2008 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 # 
@@ -28,8 +28,9 @@
 m4_define([my_version], [1.4.9rc1])
 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'|head -1)]))
+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 gnu.org])
 # Set development_version to yes if the minor number is odd or you