From b0c36251a9853bd798fde975425cae50d574011a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Sep 2005 14:37:02 +0000
Subject: * lib/mkmf.rb (find_executable0): default path if environment is not 
  set.  [ruby-dev:27281]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  5 +++++
 lib/mkmf.rb | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 042b2b0a7..c8adaef1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (find_executable0): default path if environment is not
+	  set.  [ruby-dev:27281]
+
 Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* test/readline/test_readline.rb (TestReadline::replace_stdio):
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 3ddfced1d..013a67190 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))
-- 
cgit