merges r32333 from trunk into ruby_1_9_2.

--
configure.in: Add warnflags for XL/C on AIX during configure
              to avoid [Bug #3971]. See [ruby-core:32859]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bb7bc7d109..412ad09d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 30 21:18:35 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: Add warnflags for XL/C on AIX during configure
+	  to avoid [Bug #3971]. See [ruby-core:32859]
+
 Thu Jun 30 20:12:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
diff --git a/configure.in b/configure.in
index 8e481b748d..3f94ac8807 100644
--- a/configure.in
+++ b/configure.in
@@ -421,6 +421,9 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
                              [wflag=-Wall])
     RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
 fi
+if test "$GCC" = ""; then
+    AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"])
+fi
 if test "$GCC" = yes; then
     if test "$visibility_option" = yes; then
 	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
diff --git a/version.h b/version.h
index 822ad624f1..c2e31328d5 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 308
+#define RUBY_PATCHLEVEL 309
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1