From 4857e1d30018e0fc7449af149449745410db01a6 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 22 Sep 2005 14:37:02 +0000 Subject: [PATCH] * lib/mkmf.rb (find_executable0): default path if environment is not set. [ruby-dev:27281] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- lib/mkmf.rb | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a21ed9d103..a1986c5b75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ +Thu Sep 22 23:36:24 2005 Nobuyoshi Nakada + + * lib/mkmf.rb (find_executable0): default path if environment is not + set. [ruby-dev:27281] + Thu Sep 22 17:31:48 2005 Shugo Maeda - + * test/readline/test_readline.rb (TestReadline::replace_stdio): merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223]. (merged from ruby_1_8 branch) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 29675b2d5a..400d890aa2 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -762,8 +762,17 @@ def what_type?(type, member = nil, headers = nil, &b) end def find_executable0(bin, path = nil) - path = (path || ENV['PATH']).split(File::PATH_SEPARATOR) ext = config_string('EXEEXT') + if File.expand_path(bin) == bin + return bin if File.executable?(bin) + return file if ext and File.executable?(file = bin + ext) + return nil + end + if path ||= ENV['PATH'] + path = path.split(File::PATH_SEPARATOR) + else + path = %w[/usr/local/bin /usr/ucb /usr/bin /bin] + end file = nil path.each do |dir| return file if File.executable?(file = File.join(dir, bin))