From fc41626a9b9f1acf1936598e3e35f316714105dd Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 7 Mar 2008 19:08:31 +0000 Subject: * configure.ac: Darwin's /bin/sh has a builtin echo that doesn't understand '-n'. Use tr to trim the carriage return instead. --- ChangeLog | 5 +++++ configure.ac | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cc42e38b..09c80f1e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-07 David Shaw + + * 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 * configure.ac: Post-release update. diff --git a/configure.ac b/configure.ac index ea1e4fcbd..9974ca1e4 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ min_automake_version="1.9.3" 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@gnu.org]) # Set development_version to yes if the minor number is odd or you -- cgit v1.2.3