From 40e3baf292e77d7bfa1a7ffc56ba16bc232b49b0 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 12 Jul 2008 15:03:28 +0000
Subject: [PATCH] merge revision(s) 17841,17845,17858: 	* configure.in (erfc):
 erfc of glibc comes with Debian GNU/Linux Etch 	  on IA64 is broken. 
 erfc(10000.0) aborts. 	  use missing/erf.c instead. 	 
 http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  7 +++++++
 configure.in | 21 +++++++++++++++++++++
 version.h    |  8 ++++----
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c23b9a3cb..d71ab4e8c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jul 13 00:02:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
+	  on IA64 is broken.  erfc(10000.0) aborts.
+	  use missing/erf.c instead.
+	  http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
+
 Thu Jul 10 18:44:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_extname): fix for file name with spaces.
diff --git a/configure.in b/configure.in
index ee0e81c257..c7758620f7 100644
--- a/configure.in
+++ b/configure.in
@@ -530,6 +530,27 @@ esac
 AC_FUNC_MEMCMP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(ftello)
+
+# http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
+# Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
+# Debian GNU/Linux Lenny's libc6.1 2.7-10 has no problem.
+AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_broken_glibc_ia64_erfc,
+  [AC_TRY_RUN([
+#include <math.h>
+int
+main()
+{
+   erfc(10000.0);
+   return 0;
+}
+],
+	rb_broken_glibc_ia64_erfc=no,
+	rb_broken_glibc_ia64_erfc=yes,
+	rb_broken_glibc_ia64_erfc=no)])
+case $rb_broken_glibc_ia64_erfc in
+  yes) ac_cv_func_erf=no;;
+esac
+
 AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul crypt flock vsnprintf\
 		 isnan finite isinf hypot acosh erf)
diff --git a/version.h b/version.h
index a37dd6f12a..99b141df7d 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-07-10"
+#define RUBY_RELEASE_DATE "2008-07-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080710
-#define RUBY_PATCHLEVEL 273
+#define RUBY_RELEASE_CODE 20080713
+#define RUBY_PATCHLEVEL 274
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];