nobu	2012-02-19 12:29:29 +0900 (Sun, 19 Feb 2012)

  New Revision: 34690

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

  Log:
    merge revision(s) 33327:
    
    * configure.in: ignore all warnings from an arbitrary
      header in /usr/local/include.

  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 34689)
+++ ruby_1_9_3/configure.in	(revision 34690)
@@ -2093,7 +2093,7 @@
 			# /usr/local/include is always searched for
 			# some reason, but /usr/local/lib is not.
 			hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'`
-			if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then
+			if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null 2>/dev/null | fgrep -q "$hdr"; then
 			    $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' ||
 			    echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
 			    LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34689)
+++ ruby_1_9_3/ChangeLog	(revision 34690)
@@ -1,3 +1,8 @@
+Sun Feb 19 12:27:24 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: ignore all warnings from an arbitrary
+	  header in /usr/local/include.
+
 Fri Feb 17 12:51:25 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (create_header): log the content of header.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34689)
+++ ruby_1_9_3/version.h	(revision 34690)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 133
+#define RUBY_PATCHLEVEL 134
 
-#define RUBY_RELEASE_DATE "2012-02-17"
+#define RUBY_RELEASE_DATE "2012-02-19"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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