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 | e6c0a7836cdcb60b0f0f75b3e0d4fee56b3e28e2 (patch) | |
| tree | ac66adde6dc1d4b6adc42548192d9b223666ae09 | |
| parent | 42c9483e6e06f731ddcaa89e2491945b51f90999 (diff) | |
| download | ruby-e6c0a7836cdcb60b0f0f75b3e0d4fee56b3e28e2.tar.gz | |
* configure.in (CFLAGS, CXXFLAGS): strips extra spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 10 insertions, 6 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. + Tue May 5 11:29:07 2009 NARUSE, Yui <naruse@ruby-lang.org> * tool/ifchange: Fix: arguments which begin with minus sign may diff --git a/configure.in b/configure.in index e11316af42..724b58bbd8 100644 --- a/configure.in +++ b/configure.in @@ -2218,12 +2218,12 @@ fi 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 if test "${ARCH_FLAG}"; then archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'` @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-05-05" +#define RUBY_RELEASE_DATE "2009-05-06" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |