--- ruby-1.8.2/ext/tcltklib/extconf.rb.lib64 2004-12-23 05:16:43.000000000 +0100 +++ ruby-1.8.2/ext/tcltklib/extconf.rb 2004-12-31 15:21:13.024301329 +0100 @@ -18,6 +18,11 @@ have_library("m", "log") end +$lib = "lib" +if RUBY_PLATFORM =~ /x86_64-linux/ + $lib = "lib64" +end + dir_config("tk") dir_config("tcl") dir_config("X11") @@ -27,7 +32,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/"+$lib, "/usr/pkg/"+$lib, "/usr/"+$lib] if stubs func = "Tcl_InitStubs" lib = "tclstub" @@ -50,7 +55,7 @@ end def find_tk(tklib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] + paths = ["/usr/local/"+$lib, "/usr/pkg/"+$lib, "/usr/"+$lib] if stubs func = "Tk_InitStubs" lib = "tkstub" @@ -243,7 +248,7 @@ if mac_need_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/"+$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