nobu	2011-06-07 13:37:08 +0900 (Tue, 07 Jun 2011)

  New Revision: 31947

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

  Log:
    * ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
      command line escape issues on Windows.  fixed #4835.

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31946)
+++ ChangeLog	(revision 31947)
@@ -1,3 +1,8 @@
+Tue Jun  7 13:36:51 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
+	  command line escape issues on Windows.  fixed #4835.
+
 Tue Jun  7 03:18:45 2011  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ruby/test_io.rb (TestIO#test_s_{,bin}write): do not create a
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 31946)
+++ ext/tk/extconf.rb	(revision 31947)
@@ -370,7 +370,7 @@
           vtcl != vtk )
   }
 
-  defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}.join(' ')
+  defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}
 end
 
 def parse_tclConfig(file)
@@ -1942,7 +1942,7 @@
 $CPPFLAGS ||= ""
 # $CPPFLAGS += " #{TclConfig_Info['TCL_DEFS']}"
 # $CPPFLAGS += " #{TkConfig_Info['TK_DEFS']}"
-$CPPFLAGS += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
+$defs += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
 
 # MacOS X Frameworks?
 if TkLib_Config["tcltk-framework"]
@@ -2018,9 +2018,8 @@
   $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
 
   # create
-  $CPPFLAGS ||= ""
-  $CPPFLAGS << %[ -DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-  $CPPFLAGS << %[ -DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
+  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+  $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
 
   create_makefile("tcltklib")
 

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