* ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.

* ext/tk/*: Support new features of Tcl/Tk8.6b1 and minor bug fixes.
     ( [KNOWN BUG] Ruby/Tk on Ruby 1.9 will not work on Cygwin. )
* ext/tk/*: Unify sources between Ruby 1.8 & 1.9.
            Improve default_widget_set handling.
* ext/tk/*: Multi-TkInterpreter (multi-tk.rb) works on Ruby 1.8 & 1.9.
     ( [KNOWN BUG] On Ruby 1.8, join to a long term Thread on Tk
       callbacks may freeze. On Ruby 1.9, cannot create a second 
       master interpreter (creating slaves are OK); supported master
       interpreter is the default master interpreter only. )
* ext/tk/lib/tkextlib/*: Update supported versions of Tk extensions.
         Tcllib 1.8/Tklib 0.4.1  ==>  Tcllib 1.11.1/Tklib 0.5
         BWidgets 1.7            ==>  BWidgets 1.8
         TkTable 2.9             ==>  TkTable 2.10
         TkTreeCtrl 2005-12-02   ==>  TkTreeCtrl 2.2.9
         Tile 0.8.0/8.5.1        ==>  Tile 0.8.3/8.6b1
         IncrTcl 2005-02-14      ==>  IncrTcl 2008-12-15
         TclX 2005-02-07         ==>  TclX 2008-12-15
         Trofs 0.4.3             ==>  Trofs 0.4.4


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

1 files changed, 42 insertions, 1 deletions

diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
index 8c6dd5178f..0db2758f26 100644
--- a/ext/tk/README.tcltklib
+++ b/ext/tk/README.tcltklib
@@ -1,18 +1,53 @@
 To compile 'tcltklib', you must have Tcl/Tk libraries on your environment. 
-Although 'extconf.rb' script searches Tcl/Tk libraries and header files, 
+Although 'extconf.rb' script searches Tcl/Tk libraries and header files
+(as default, searches tclConfig.sh/tkConfig.sh and use the defintions on
+those; ActiveTcl has high priority on searching unless --without-ActiveTcl),
 sometimes fails to find them. And then, 'tcltklib' cannot be compiled. If 
 Tcl/Tk libraries or header files are installed but are not found, you can 
 give the information by arguments of the 'configure' script. Please give 
 some or all of the following options. 
 
+ --with-tk-old-extconf         use old "extconf.rb" (default: false).
+                               If current extconf.rb doesn't work properly
+                               (or your install process is based on old 
+                               documant about Ruby/Tk install), please try
+			       this option.
+
+ --with-ActiveTcl / --without-ActiveTcl
+ --with-ActiveTcl=<dir>        search ActiveTcl libraries (default: true).
+                               When true, try to find installed ActiveTcl. 
+                               When <dir> is given, use it as the ActiveTcl's
+			       top directory (use <dir>/lib, and so on).
+                               Old "extconf.rb" doesn't support this option.
+
+ --with-tk-shlib-search-path=<paths>
+                               teach the paths for loading shared-libraries 
+                               to linker.
+                               <paths> is a path list with the same format 
+                               as PATH environment variable.
+                               This option may be experimental.
+                               Old "extconf.rb" doesn't support this option.
+
  --with-tcltkversion=<version> 
       force version of Tcl/Tk libaray
       (e.g. libtcl8.4g.so ==> --with-tcltkversion=8.4g)
 
+ --without-tcl-config / --without-tk-config
+ --with-tclConfig-dir=<dir>       
+ --with-tkConfig-dir=<dir>     the directory contains 'tclConfig.sh' and 
+                               'tkConfig.sh'. 
+			       Current "extconf.rb" uses the information 
+                               on tclConfig.sh/tkConfig.rb, if possible.
+                               Old "extconf.rb" doesn't support this option.
+
  --with-tcllib=<libname>       (e.g. libtcl8.4.so ==> --with-tcllib=tcl8.4)
  --with-tklib=<libname>        (e.g. libtk8.4.so  ==> --with-tklib=tk8.4)
 
  --enable-tcltk-stubs          (if you force to enable stubs)
+                               On old "extconf.rb", default is false.
+                               On current "extconf.rb", default is true when 
+                               tclConfig.sh/tkConfig.sh have TCL_STUB_LIB_SPEC
+                               /TK_STUB_LIB_SPEC, else default is false.
 
  --with-tcl-dir=<path> 
       equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
@@ -36,6 +71,12 @@ some or all of the following options.
                                When this option is given, it is assumed that 
                                --enable-tcltk-framework option is given also.
 
+ --with-tcl-framework-dir=<dir>
+      Tcl framework directory (e.g. "/Library/Frameworks/Tcl.framework")
+
+ --with-tk-framework-dir=<dir>
+      Tk framework directory (e.g. "/Library/Frameworks/Tk.framework")
+
  --with-tcl-framework-header=<dir>
       Tcl framework headers directory 
       (e.g. "/Library/Frameworks/Tcl.framework/Headers")