diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-05 15:00:33 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-05 15:00:33 +0000 |
commit | 01e3a55648559ba3d54cdf72d5c55f71a41e69e9 (patch) | |
tree | 4fd777ee73c1cbf599df4ab0b6276ad789f20e9b /lib | |
parent | d833e3db01f8a293c36d1df14cb9d8fff600ea73 (diff) |
* lib/mkmf.rb (have_library, find_library): configure by library
name.
* win32/win32.c (isInternalCmd): distinguish command.com and
cmd.exe.
* win32/win32.c (make_cmdvector): a character just after wildcard
was ignored. [ruby-core:01518]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index b5a64fa9a4..2cf79c8d40 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -456,7 +456,8 @@ end def have_library(lib, func = nil, &b) func = "main" if !func or func.empty? - checking_for "#{func}() in -l#{lib}" do + lib = with_config(lib+'lib', lib) + checking_for "#{func}() in #{LIBARG%lib}" do if COMMON_LIBS.include?(lib) true else @@ -472,7 +473,9 @@ def have_library(lib, func = nil, &b) end def find_library(lib, func, *paths, &b) - checking_for "#{func}() in -l#{lib}" do + func = "main" if !func or func.empty? + lib = with_config(lib+'lib', lib) + checking_for "#{func}() in #{LIBARG%lib}" do libpath = $LIBPATH libs = append_library($libs, lib) begin |