1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/tk/extconf.rb: support --with-X11/--without-X11 option.

Browse Source 
* ext/tk/README.tcltklib: add description about --with-X11-* option
  [ruby-talk:225166] and --with-X11/--without-X11 option.
* ext/tk/tkutil/extconf.rb: able to be called manually [ruby-talk:225950].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2006-11-22 07:06:11 +00:00
parent 135a96accc
commit c97ed5ef9a
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Wed Nov 22 16:00:49 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: support --with-X11/--without-X11 option.
* ext/tk/README.tcltklib: add description about --with-X11-* option
[ruby-talk:225166] and --with-X11/--without-X11 option.
* ext/tk/tkutil/extconf.rb: able to be called manually
[ruby-talk:225950].
Tue Nov 7 18:35:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Nov 7 18:35:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (formal_assign): need to pack rest arg information in * eval.c (formal_assign): need to pack rest arg information in

9
ext/tk/README.tcltklib
View File

@ -41,6 +41,15 @@ some or all of the following options.
(e.g. "/Library/Frameworks/Tk.framework/Headers") (e.g. "/Library/Frameworks/Tk.framework/Headers")
--with-X11 / --without-X11 use / not use the X Window System
--with-X11-dir=<path>
equal to "--with-X11-include=<path>/include --with-X11-lib=<path>/lib"
--with-X11-include=<dir> the directry contains X11 header files
--with-X11-lib=<dir> the directry contains X11 libraries
If you forgot to give the options when do 'configure' on toplevel If you forgot to give the options when do 'configure' on toplevel
directry of Ruby sources, please try something like as the followings. directry of Ruby sources, please try something like as the followings.

7
ext/tk/extconf.rb
View File

@ -47,6 +47,8 @@ tklib = with_config("tklib")
tcllib = with_config("tcllib") tcllib = with_config("tcllib")
stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs") stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
use_X = with_config("X11", (! is_win32))
def find_tcl(tcllib, stubs) def find_tcl(tcllib, stubs)
paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
if stubs if stubs
@ -273,8 +275,9 @@ end
if tcltk_framework || if tcltk_framework ||
(have_header("tcl.h") && have_header("tk.h") && (have_header("tcl.h") && have_header("tk.h") &&
(is_win32 || find_library("X11", "XOpenDisplay", ( !use_X || find_library("X11", "XOpenDisplay",
"/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) && "/usr/X11/lib", "/usr/lib/X11",
"/usr/X11R6/lib", "/usr/openwin/lib")) &&
find_tcl(tcllib, stubs) && find_tcl(tcllib, stubs) &&
find_tk(tklib, stubs)) find_tk(tklib, stubs))
$CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs

9
ext/tk/tkutil/extconf.rb
View File

@ -1,4 +1,11 @@
if compiled?('tk') begin
has_tk = compiled?('tk')
rescue NoMethodError
# Probably, called manually (NOT from 'extmk.rb'). Force to make Makefile.
has_tk = true
end
if has_tk
require 'mkmf' require 'mkmf'
create_makefile('tkutil') create_makefile('tkutil')
end end