diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-04 04:07:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-04 04:07:01 +0000 |
| commit | eaa1f94313d1b7918dd310bcfe7f208a52b5db98 (patch) | |
| tree | 3b519d088dd4574faa377aec5915cee57c9b4f08 | |
| parent | ce5770b5db9b4a655d97b84b87a2c87cde429c3a (diff) | |
* configure.in (CFLAGS, CXXFLAGS): include additional flags to
CFLAGS and CXXFLAGS while configuration.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jun 4 13:06:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (CFLAGS, CXXFLAGS): include additional flags to + CFLAGS and CXXFLAGS while configuration. + Tue Jun 3 19:33:22 2008 Akinori MUSHA <knu@iDaemons.org> * enumerator.c (enumerator_init_copy): Take care of diff --git a/configure.in b/configure.in index 821b74ed50..3a9fb38761 100644 --- a/configure.in +++ b/configure.in @@ -156,7 +156,10 @@ AC_ARG_PROGRAM dnl Checks for programs. -: ${CFLAGS=} ${CXXFLAGS=} +: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'} +: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'} +CFLAGS="${CFLAGS} `eval echo $cflags`" +CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`" if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi @@ -1638,8 +1641,11 @@ case "$build_os" in esac CPPFLAGS="$CPPFLAGS "'$(DEFS)' -test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}' 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}|'` AC_SUBST(cppflags, [])dnl AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(optflags)dnl @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-06-03" +#define RUBY_RELEASE_DATE "2008-06-04" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080603 +#define RUBY_RELEASE_CODE 20080604 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |