31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
|
|
--- ruby-1.8.4.orig/ext/tk/extconf.rb 2005-11-02 20:28:40.000000000 +0900
|
|
+++ ruby-1.8.4/ext/tk/extconf.rb 2005-12-16 19:44:57.000000000 +0900
|
|
@@ -48,7 +48,7 @@
|
|
stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
|
|
|
|
def find_tcl(tcllib, stubs)
|
|
- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
|
|
+ paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
|
|
if stubs
|
|
func = "Tcl_InitStubs"
|
|
lib = "tclstub"
|
|
@@ -71,7 +71,7 @@
|
|
end
|
|
|
|
def find_tk(tklib, stubs)
|
|
- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
|
|
+ paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
|
|
if stubs
|
|
func = "Tk_InitStubs"
|
|
lib = "tkstub"
|
|
@@ -274,7 +274,7 @@
|
|
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")) &&
|
|
+ "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib")) &&
|
|
find_tcl(tcllib, stubs) &&
|
|
find_tk(tklib, stubs))
|
|
$CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
|