From 8faf08a4e17b3b7d3621b429688bab9775fbf335 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 22 Nov 2006 07:06:11 +0000
Subject: * 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].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/README.tcltklib   | 9 +++++++++
 ext/tk/extconf.rb        | 7 +++++--
 ext/tk/tkutil/extconf.rb | 9 ++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'ext/tk')

diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
index 5d1da48a45..e939ba1f51 100644
--- a/ext/tk/README.tcltklib
+++ b/ext/tk/README.tcltklib
@@ -41,6 +41,15 @@ some or all of the following options.
       (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
 directry of Ruby sources, please try something like as the followings.
 
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 8c8d833481..5ed86a8b76 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -47,6 +47,8 @@ tklib = with_config("tklib")
 tcllib = with_config("tcllib")
 stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
 
+use_X = with_config("X11", (! is_win32))
+
 def find_tcl(tcllib, stubs)
   paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
   if stubs
@@ -273,8 +275,9 @@ end
 
 if tcltk_framework || 
    (have_header("tcl.h") && have_header("tk.h") &&
-    (is_win32 || find_library("X11", "XOpenDisplay",
-      "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
+      ( !use_X || find_library("X11", "XOpenDisplay",
+                               "/usr/X11/lib", "/usr/lib/X11", 
+                               "/usr/X11R6/lib", "/usr/openwin/lib")) &&
     find_tcl(tcllib, stubs) &&
     find_tk(tklib, stubs))
   $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
index e3aa00a4b2..dd00d5d535 100644
--- a/ext/tk/tkutil/extconf.rb
+++ b/ext/tk/tkutil/extconf.rb
@@ -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'
   create_makefile('tkutil')
 end
-- 
cgit v1.2.3