summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-17 14:32:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-17 14:32:02 +0000
commitbc3fe18226ff3cd1eaec8f127a9d1cbd2eeab76d (patch)
tree807a662823d28b6530fa4a293bbe13eecee55d58
parentfd3690d34b82757643d45c88b7450520d7c7be93 (diff)
* 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/branches/ruby_1_8@10547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d5dc1600e6..c52123ca5a 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 13:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (define_swapx): should not use plain malloc.
diff --git a/configure.in b/configure.in
index e6b1909afb..e90eac43ff 100644
--- a/configure.in
+++ b/configure.in
@@ -183,10 +183,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])
AC_ARG_WITH(winsock2,
[ --with-winsock2 link winsock2 (MinGW only)], [
case $withval in