nobu	2008-06-04 13:07:01 +0900 (Wed, 04 Jun 2008)

  New Revision: 16800

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/configure.in
    trunk/version.h

  Log:
    * configure.in (CFLAGS, CXXFLAGS): include additional flags to
      CFLAGS and CXXFLAGS while configuration.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=16800&r2=16799&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=16800&r2=16799&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16800&r2=16799&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16800&r2=16799&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=16800&r2=16799&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=16800&r2=16799&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 16799)
+++ configure.in	(revision 16800)
@@ -176,7 +176,10 @@
 
 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 @@
 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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16799)
+++ ChangeLog	(revision 16800)
@@ -1,3 +1,8 @@
+Wed Jun  4 13:06:58 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (CFLAGS, CXXFLAGS): include additional flags to
+	  CFLAGS and CXXFLAGS while configuration.
+
 Tue Jun  3 23:06:35 2008  Yusuke Endoh  <mame@t...>
 
 	* ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix
Index: version.h
===================================================================
--- version.h	(revision 16799)
+++ version.h	(revision 16800)
@@ -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[];
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 16799)
+++ ruby_1_8/configure.in	(revision 16800)
@@ -156,7 +156,10 @@
 
 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 @@
 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
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16799)
+++ ruby_1_8/ChangeLog	(revision 16800)
@@ -1,3 +1,8 @@
+Wed Jun  4 13:06:58 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (CFLAGS, CXXFLAGS): include additional flags to
+	  CFLAGS and CXXFLAGS while configuration.
+
 Tue Jun  3 19:33:22 2008  Akinori MUSHA  <knu@i...>
 
 	* enumerator.c (enumerator_init_copy): Take care of
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 16799)
+++ ruby_1_8/version.h	(revision 16800)
@@ -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[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/