diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-05 20:34:05 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-05 20:34:05 +0000 |
| commit | fca83c08e5aea02d0442575781a915777c4794bb (patch) | |
| tree | eea4827d9e15dbc71597d2a810687c4379588464 | |
| parent | 129520dc6546a8250e8f0c49cf9fc9ff21365124 (diff) | |
* configure.in (CFLAGS, CXXFLAGS): strips extra spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Wed May 6 05:33:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (CFLAGS, CXXFLAGS): strips extra spaces. + Sat May 2 22:53:02 2009 Akinori MUSHA <knu@iDaemons.org> * lib/set.rb (SortedSet): Fix document. [Bug #1429] diff --git a/configure.in b/configure.in index a71a49c000..e7859d6e60 100644 --- a/configure.in +++ b/configure.in @@ -1711,12 +1711,12 @@ esac CPPFLAGS="$CPPFLAGS "'$(DEFS)' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' if test -n "${cflags+set}"; then - cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g'` - CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'` + cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/^ *$/ /'` + CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'` fi if test -n "${cxxflags+set}"; then - cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g'` - CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'` + cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/^ *$/ /'` + CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'` fi AC_SUBST(cppflags, [])dnl AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-05-02" +#define RUBY_RELEASE_DATE "2009-05-06" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20090502 +#define RUBY_RELEASE_CODE 20090506 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |