merge revision(s) 11194:11196:

	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.


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

3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f20d8d0a4..0827e8b397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 16 19:18:35 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
+
 Mon Jun 16 17:11:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 563ce9e5f4..0082059329 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1483,9 +1483,8 @@ EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
 
 hdr = []
 config_string('COMMON_MACROS') do |s|
-  Shellwords.shellwords(s).each do |s|
-    /(.*?)(?:=(.*))/ =~ s
-    hdr << "#define #$1 #$2"
+  Shellwords.shellwords(s).each do |w|
+    hdr << "#define " + w.split(/=/, 2).join(" ")
   end
 end
 config_string('COMMON_HEADERS') do |s|
diff --git a/version.h b/version.h
index ae8716ba00..c728d01d83 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-16"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080616
-#define RUBY_PATCHLEVEL 222
+#define RUBY_PATCHLEVEL 223
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8