nagai	2008-07-03 10:22:52 +0900 (Thu, 03 Jul 2008)

  New Revision: 17838

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/tk/extconf.rb

  Log:
    * ext/tk/extconf.rb: should not check "tcl.h" & "tk.h" when
      --enable-tcltk-framework on MacOS X.



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

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/tk/extconf.rb?r1=17838&r2=17837&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17838&r2=17837&diff_format=u

Index: ruby_1_8/ext/tk/extconf.rb
===================================================================
--- ruby_1_8/ext/tk/extconf.rb	(revision 17837)
+++ ruby_1_8/ext/tk/extconf.rb	(revision 17838)
@@ -378,11 +378,11 @@
 
 tclver, tkver = check_tcltk_version(tcltk_version)
 
-if have_header("tcl.h") && have_header("tk.h") && 
-    ( tcltk_framework || 
-        ( ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
-            find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
-            find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
+if ( tcltk_framework || 
+       ( have_header("tcl.h") && have_header("tk.h") && 
+           ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
+           find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
+           find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
   $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
   $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17837)
+++ ruby_1_8/ChangeLog	(revision 17838)
@@ -1,3 +1,8 @@
+Thu Jul  3 10:21:43 2008  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/extconf.rb: should not check "tcl.h" & "tk.h" when
+	  --enable-tcltk-framework on MacOS X.
+
 Thu Jul  3 10:03:17 2008  Tanaka Akira  <akr@f...>
 
 	* gc.c (Init_GC): fix syntax error.

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