diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-03-28 11:05:46 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-03-28 11:05:46 +0000 |
commit | d6e2d211afaf7bc3d08a6f833fe8e20f3aa3e3f6 (patch) | |
tree | 32d67c633f166665552156bf01fa698be7535336 /ext | |
parent | 7253910df83611f0c2aa4f6c5a5718680b9aea60 (diff) |
1.1b9_05 patches
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/tcltklib/extconf.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index 8032b1357b..201070c4dd 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -40,11 +40,10 @@ search_header("tk.h", "/usr/local/include/tk*", "/usr/local/include") search_header("X11/Xlib.h", + "/usr/include/X11*", "/usr/include", - "/usr/X11*/include", - "/usr/include", - "/usr/X11*/include", - "/usr/openwin/include") + "/usr/openwin/include", + "/usr/X11*/include") $CFLAGS = "-Wall " + $includes.collect{|path| "-I" + path}.join(" ") @@ -75,7 +74,7 @@ end if have_header("tcl.h") && have_header("tk.h") && search_lib("libX11.{a,so}", "XOpenDisplay", - "/usr/lib", "/usr/X11*/lib", "/usr/openwin/lib") && + "/usr/lib", "/usr/openwin/lib", "/usr/X11*/lib") && search_lib("libtcl{,7*,8*}.{a,so}", "Tcl_FindExecutable", "/usr/lib", "/usr/local/lib") && search_lib("libtk{,4*,8*}.{a,so}", "Tk_Init", |