diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-06 11:16:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-06 11:16:15 +0000 |
| commit | 359e5930cbb9fe44d7ae51e2a61204264580354f (patch) | |
| tree | 10aac0a7e3b7bce84c608cb3fec21cb5107b9679 | |
| parent | 3175b6e7bba9171dbffa55a7c70b5f8416428d33 (diff) | |
* configure.in (CFLAGS, CXXFLAGS): use orignal values if given.
[ruby-core:23130]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 29 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 28 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Mon Apr 6 20:16:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (CFLAGS, CXXFLAGS): use orignal values if given. + [ruby-core:23130] + Fri Apr 3 18:37:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * gc.c (Init_stack): use ruby_init_stack. [ruby-dev:34350] diff --git a/configure.in b/configure.in index 3e6aab1ff1..e55056e90a 100644 --- a/configure.in +++ b/configure.in @@ -148,8 +148,14 @@ AC_ARG_PROGRAM dnl Checks for programs. -: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'} -: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'} +if test -z "${CFLAGS+set}"; then + orig_cflags="$cflags" + cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'} +fi +if test -z "${CXXFLAGS+set}"; then + orig_cxxflags="$cxxflags" + cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'} +fi if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi @@ -162,8 +168,8 @@ if test "$GCC" = yes; then else linker_flag= fi -CFLAGS="${CFLAGS} `eval echo $cflags`" -CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`" +test -n "${cflags+set}" && CFLAGS="${CFLAGS} `eval echo $cflags`" +test -n "${cxxflags+set}" && CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`" RUBY_PROG_GNU_LD RUBY_CPPOUTFILE @@ -1703,12 +1709,17 @@ esac CPPFLAGS="$CPPFLAGS "'$(DEFS)' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' -cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[][|.*]/\\&/g'` -CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'` -cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[][|.*]/\\&/g'` -CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'` +if test -n "${cflags+set}"; then + cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g'` + CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'` +fi +if test -n "${cxxflags+set}"; then + cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g'` + CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'` +fi AC_SUBST(cppflags, [])dnl -AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl +AC_SUBST(cflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl +AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(optflags)dnl AC_SUBST(debugflags)dnl AC_SUBST(warnflags)dnl @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-04-03" +#define RUBY_RELEASE_DATE "2009-04-06" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20090403 +#define RUBY_RELEASE_CODE 20090406 #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 4 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |