From c993c31c541d875596128ec15d038992ca6554dd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 Jul 2006 14:32:02 +0000
Subject: [PATCH] * configure.in (rb_cv_msvcrt): defaulted to msvcrt. 
 Workaround for a   bug of cygwin 1.5.20.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 13 +++++++++----
 configure.in |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f16192ac90..022686c99f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
+	  bug of cygwin 1.5.20.
+
 Mon Jul 17 22:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/io/wait/wait.c (io_ready_p): protoize.
@@ -41,14 +46,14 @@ Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the 
+	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
 	  option database for the widget class which includes TkComposite.
 
 Thu Jul 13 00:40:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h (FIX2LONG): returns integer of size of VALUE.
 	  [ruby-dev:29024]
-	
+
 	* ruby.h (FIX2ULONG): ditto.
 
 Wed Jul 12 20:05:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -68,7 +73,7 @@ Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Jul 11 19:13:33 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/multi-tk.rb: remove restriction on the class of 
+	* ext/tk/lib/multi-tk.rb: remove restriction on the class of
 	  pseudo-toplevel.
 
 Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -185,7 +190,7 @@ Mon Jul 10 02:22:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  record.
 
 	* eval.c (proc_alloc): return preserved block object if it's
-	  available. 
+	  available.
 
 Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/configure.in b/configure.in
index 054350802b..7d78212587 100644
--- a/configure.in
+++ b/configure.in
@@ -179,10 +179,10 @@ cygwin*|mingw*)
 	AC_TRY_LINK([#include <stdio.h>],
 		    [FILE* volatile f = stdin; return 0;],
 		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
-		     		   tr A-Z a-z |
+				   tr A-Z a-z |
 				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
-		    [rb_cv_msvcrt=msvcrt])])
-	test "$rb_cv_msvcrt" = "" && AC_MSG_ERROR([must be linked to DLL])
+		    [rb_cv_msvcrt=msvcrt])
+	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
     esac
     : ${enable_shared=yes}
     ;;