From 7031f4dec8837e16d865804781cc0727cd946043 Mon Sep 17 00:00:00 2001 From: wyhaines Date: Mon, 3 Aug 2009 16:09:33 +0000 Subject: Pulled the date.rb change; it should not have been applied. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/extconf.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 5ed86a8b76..7cc24c36b6 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -50,7 +50,7 @@ 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"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tcl_InitStubs" lib = "tclstub" @@ -276,8 +276,10 @@ end if tcltk_framework || (have_header("tcl.h") && have_header("tk.h") && ( !use_X || 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 -- cgit v1.2.3