pvalena / rpms / ruby

Forked from rpms/ruby 3 years ago
Clone
1cfcc9
diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
1cfcc9
--- ruby-1.8.4.orig/ext/tk/extconf.rb	2005-11-02 20:28:40.000000000 +0900
1cfcc9
+++ ruby-1.8.4/ext/tk/extconf.rb	2005-12-16 19:44:57.000000000 +0900
1cfcc9
@@ -48,7 +48,7 @@
1cfcc9
 stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
1cfcc9
 
1cfcc9
 def find_tcl(tcllib, stubs)
1cfcc9
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
b14774
+  paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
1cfcc9
   if stubs
1cfcc9
     func = "Tcl_InitStubs"
1cfcc9
     lib = "tclstub"
1cfcc9
@@ -71,7 +71,7 @@
1cfcc9
 end
1cfcc9
 
1cfcc9
 def find_tk(tklib, stubs)
1cfcc9
-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
b14774
+  paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
1cfcc9
   if stubs
1cfcc9
     func = "Tk_InitStubs"
1cfcc9
     lib = "tkstub"
1cfcc9
@@ -274,7 +274,7 @@
1cfcc9
 if tcltk_framework || 
1cfcc9
    (have_header("tcl.h") && have_header("tk.h") &&
1cfcc9
     (is_win32 || find_library("X11", "XOpenDisplay",
1cfcc9
-      "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
b14774
+      "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib")) &&
1cfcc9
     find_tcl(tcllib, stubs) &&
1cfcc9
     find_tk(tklib, stubs))
1cfcc9
   $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs