From e9f9915a4c305ac02d8634b14579119433bc7b43 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 31 Jan 2001 14:27:37 +0000
Subject: gcc-2.95.2-7(cygwin) support.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             |  7 +++++++
 configure.in          | 20 +++++++++++++-------
 cygwin/GNUmakefile.in |  2 +-
 version.h             |  4 ++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 061e28b989..9e900ef5ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 31 22:27:29 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: gcc-2.95.2-7(cygwin) support.
+	  add -mwin32 if available.
+
+	* cygwin/GNUmakefile: ditto.
+
 Mon Jan 29 14:25:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (block_pass): return from block jumps directory to
diff --git a/configure.in b/configure.in
index 2a099a0c6b..2dce3d9fcb 100644
--- a/configure.in
+++ b/configure.in
@@ -90,14 +90,20 @@ AC_CHECK_TOOL(AR, ar)
 AC_CHECK_PROGS(AR, ar aal, ar)
 
 case "$target_os" in
-    cygwin*|mingw*)
-	AC_CHECK_TOOL(NM, nm)
-	AC_CHECK_TOOL(DLLWRAP, dllwrap)
-	AC_CHECK_TOOL(AS, as)
-	AC_CHECK_TOOL(DLLTOOL, dlltool)
-	AC_CHECK_TOOL(WINDRES, windres)
-	;;
+cygwin*|mingw*)
+    AC_CHECK_TOOL(NM, nm)
+    AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    AC_CHECK_TOOL(AS, as)
+    AC_CHECK_TOOL(DLLTOOL, dlltool)
+    AC_CHECK_TOOL(WINDRES, windres)
+    echo 'main(){}' > conftest.c
+    if $CC -mwin32 -c conftest.c 2> /dev/null; then
+	MWIN32=-mwin32
+	CFLAGS="$CFLAGS $MWIN32"
+    fi
+    ;;
 esac
+AC_SUBST(MWIN32)
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 76ce832a31..0e89d15dec 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -21,7 +21,7 @@ $(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@
 $(LIBRUBY): $(LIBRUBY_SO)
 
 %.res.@OBJEXT@: %.rc
-	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+	@WINDRES@ --preprocessor '$(CC) -E -xc-header -DRC_INVOKE @MWIN32@' --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
 $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
 	@@MINIRUBY@ $(srcdir)/win32/resource.rb \
diff --git a/version.h b/version.h
index a24ae36bf5..0bd1341ab6 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.7.0"
-#define RUBY_RELEASE_DATE "2001-01-29"
+#define RUBY_RELEASE_DATE "2001-01-31"
 #define RUBY_VERSION_CODE 170
-#define RUBY_RELEASE_CODE 20010129
+#define RUBY_RELEASE_CODE 20010131
-- 
cgit v1.2.3