nobu	2012-05-09 16:00:10 +0900 (Wed, 09 May 2012)

  New Revision: 35603

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35603

  Log:
    merge revision(s) 33978:
    
    * configure.in (RUBY_WERROR_FLAG): append all warning flags which
      are enabled to compile, so that printf format modifiers properly
      fail.  [ruby-core:41351] [Bug #5679]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 35602)
+++ ruby_1_9_3/configure.in	(revision 35603)
@@ -409,6 +409,8 @@
 dnl compiler section {
 
 AC_DEFUN([RUBY_WERROR_FLAG], [dnl
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $rb_cv_warnflags"
 if test "${ac_c_werror_flag+set}"; then
   rb_c_werror_flag="$ac_c_werror_flag"
 else
@@ -416,6 +418,8 @@
 fi
 ac_c_werror_flag=yes
 $1
+CFLAGS="$save_CFLAGS"
+save_CFLAGS=
 if test "${rb_c_werror_flag+set}"; then
   ac_c_werror_flag="$rb_c_werror_flag"
 else
@@ -423,18 +427,15 @@
 fi])
 
 AC_DEFUN(RUBY_TRY_CFLAGS, [
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="[$]CFLAGS $1"
     AC_MSG_CHECKING([whether ]$1[ is accepted])
     RUBY_WERROR_FLAG([
+    CFLAGS="[$]CFLAGS $1"
     AC_TRY_COMPILE([$4], [$5],
 	[$2
 	AC_MSG_RESULT(yes)],
 	[$3
 	AC_MSG_RESULT(no)])
     ])
-    CFLAGS="$save_CFLAGS"
-    save_CFLAGS=
 ])
 
 AC_DEFUN(RUBY_TRY_LDFLAGS, [
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35602)
+++ ruby_1_9_3/ChangeLog	(revision 35603)
@@ -1,3 +1,9 @@
+Wed May  9 15:59:17 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_WERROR_FLAG): append all warning flags which
+	  are enabled to compile, so that printf format modifiers properly
+	  fail.  [ruby-core:41351] [Bug #5679]
+
 Mon May  7 20:23:29 2012  Tanaka Akira  <akr@f...>
 
 	* lib/securerandom.rb (random_bytes): call to_int method for the
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35602)
+++ ruby_1_9_3/version.h	(revision 35603)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 206
+#define RUBY_PATCHLEVEL 207
 
-#define RUBY_RELEASE_DATE "2012-05-07"
+#define RUBY_RELEASE_DATE "2012-05-09"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 

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