diff --git a/ChangeLog b/ChangeLog
index 611fb7481e..9abbf139c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: should test isinf for Solaris with GCC compiler.
+	  [ruby-core:08100]
+
 Fri Jun 30 19:35:41 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httputils.rb (WEBrick::HTTPUtils._escape): should
diff --git a/configure.in b/configure.in
index 14da1a5e65..a5486551e1 100644
--- a/configure.in
+++ b/configure.in
@@ -431,7 +431,9 @@ bow)		ac_cv_func_setitimer=no
 		;;
 superux*)     ac_cv_func_setitimer=no
               ;;
-solaris*2.10)  ac_cv_func_isinf=yes
+solaris*2.10)  if test -z "$GCC"; then
+                      ac_cv_func_isinf=yes
+              fi
                LIBS="-lm $LIBS"
               ;;
 *) LIBS="-lm $LIBS";;