From a76288cfc730e0a556e298e7316c5526e292095a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 4 Jun 2008 04:07:01 +0000
Subject: [PATCH] * configure.in (CFLAGS, CXXFLAGS): include additional flags
 to   CFLAGS and CXXFLAGS while configuration.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  5 +++++
 configure.in | 10 ++++++++--
 version.h    |  6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 085f892d75..995864ae4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 23:06:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix
diff --git a/configure.in b/configure.in
index db7bb14e01..23340e7315 100644
--- a/configure.in
+++ b/configure.in
@@ -176,7 +176,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
@@ -1730,8 +1733,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
diff --git a/version.h b/version.h
index b3f4010281..0ed020ea5e 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-06-03"
+#define RUBY_RELEASE_DATE "2008-06-04"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080603
+#define RUBY_RELEASE_CODE 20080604
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #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[];