From de850442f28953081c18155fa91f7449016f4400 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Mar 2010 21:49:02 +0000
Subject: [PATCH] * ext/tk/extconf.rb: log() is built-in in some compilers and
 needs   proper declaration.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 5 +++++
 ext/tk/extconf.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2df70c04b9..2e635dd5ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 12 06:48:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/extconf.rb: log() is built-in in some compilers and needs
+	  proper declaration.
+
 Fri Mar 12 06:37:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sample/timeout.rb: split from lib/timeout.rb.
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index e3deebda05..288c5e920a 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -634,7 +634,7 @@ def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
   TkLib_Config["tclConfig-dir"] = tclConfig_dir
   TkLib_Config["tkConfig-dir"] = tkConfig_dir
 
-  print("Search tclConfig.sh and tkConfig.sh.")
+  print("Search tclConfig.sh and tkConfig.sh in #{tclConfig_dir}.")
   if tclConfig_dir
     tclConfig, tkConfig = 
       search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir), 
@@ -1273,7 +1273,7 @@ unless is_win32?
   print(".") # progress
   have_library("dl", "dlopen")
   print(".") # progress
-  have_library("m", "log")
+  have_library("m", "log", "math.h")
   print("\n") # progress
 end
 $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM