usa	2013-05-15 00:26:08 +0900 (Wed, 15 May 2013)

  New Revision: 40742

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

  Log:
    merge revision(s) 39214,39221: [Backport #7830]
    
    configure.in: Werror-implicit-function-declaration
    
    * configure.in (warnflags): -Werror-implicit-function-declaration
      haven't been used as-is, but always replaced with -Werror= or -W.
    * configure.in (warnflags): disable -Werror by default unless
      development.  [ruby-core:52131] [Bug #7830]

  Modified directories:
    branches/ruby_1_9_3/
  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 40741)
+++ ruby_1_9_3/configure.in	(revision 40742)
@@ -83,6 +83,7 @@ RUBY_PROGRAM_VERSION=`sed -n 's/^#define https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L83
 AC_SUBST(RUBY_PROGRAM_VERSION)
 RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
 AC_SUBST(RUBY_RELEASE_DATE)
+RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
 if test "$MAJOR" = "1"; then
   AC_DEFINE(CANONICALIZATION_FOR_MATHN)
 fi
@@ -453,20 +454,26 @@ AC_DEFUN(RUBY_TRY_LDFLAGS, [ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L454
     save_LDFLAGS=
 ])
 
+AS_CASE([$RUBY_PATCHLEVEL], [-*],
+	[particular_werror_flags=yes], [particular_werror_flags=no])
+AC_ARG_ENABLE(werror,
+	AS_HELP_STRING([--disable-werror],
+		       [don't make warnings into errors
+		       even if a compiler support -Werror feature
+		       [[disabled by default unless development version]]]),
+	[particular_werror_flags=$enableval])
+
 rb_cv_warnflags="$warnflags"
 if test "$GCC:${warnflags+set}:no" = yes::no; then
-    particular_werror_flags=yes
     for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
 		 -Wno-missing-field-initializers \
 		 -Werror=pointer-arith \
 		 -Werror=write-strings \
 		 -Werror=declaration-after-statement \
 		 -Werror=shorten-64-to-32 \
-		 -Werror-implicit-function-declaration \
+		 -Werror=implicit-function-declaration \
 		 ; do
-	if test "$particular_werror_flags" = yes; then
-	    wflag=`echo x$wflag | sed 's/^x-Werror-/-Werror=/;s/^x//'`
-	else
+	if test "$particular_werror_flags" != yes; then
 	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
 	fi
 	ok=no
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 40741)
+++ ruby_1_9_3/ChangeLog	(revision 40742)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed May 15 00:23:07 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (warnflags): disable -Werror by default unless
+	  development.  [ruby-core:52131] [Bug #7830]
+
 Wed May 15 00:21:31 2013  NAKAMURA Usaku  <usa@r...>
 
 	* signal.c: need to include unistd.h for write(2).
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40741)
+++ ruby_1_9_3/version.h	(revision 40742)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 427
+#define RUBY_PATCHLEVEL 428
 
 #define RUBY_RELEASE_DATE "2013-05-15"
 #define RUBY_RELEASE_YEAR 2013

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39214,39221


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