[project @ 2002-06-25 15:49:58 by mthomas]

Latest Mingw32 needs libmingwex, but for now not when installing as
bundled gcc is out of date.

5 files changed, 26 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index 8855fcf414..7ee231c38e 100644
--- a/configure.in
+++ b/configure.in
@@ -916,6 +916,14 @@ AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
 AC_SUBST(HaveLibGmp)
 AC_SUBST(LibGmp)
 
+dnl ** check for mingwex library
+AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO)
+AC_SUBST(HaveLibMingwEx)
+
+if test $HaveLibMingwEx = YES ; then
+  AC_DEFINE(HAVE_MINGWEX)
+fi
+
 if test "$HaveLibGmp" = "NO"; then
 if test "$HostArch_CPP" = "ia64"; then
 AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64).])
diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 9c3e31218c..d1334a3078 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.70 2002/04/13 05:18:07 sof Exp $
+# $Id: Makefile,v 1.71 2002/06/25 15:49:58 mthomas Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -43,6 +43,10 @@ ifeq "$(HaveLibGmp)" "YES"
 PACKAGE_CPP_OPTS += -DHAVE_LIBGMP
 endif
 
+ifeq "$(HaveLibMingwEx)" "YES"
+PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
+endif
+
 ifneq "$(DLLized)" "YES"
 EXCLUDED_SRCS += RtsDllMain.c
 else
diff --git a/ghc/rts/rts.conf.in b/ghc/rts/rts.conf.in
index c4e1c3f80c..2868deb8e8 100644
--- a/ghc/rts/rts.conf.in
+++ b/ghc/rts/rts.conf.in
@@ -30,6 +30,11 @@ Package {
 #ifdef USING_LIBBFD
 			      ,"bfd", "iberty"	/* for debugging */
 #endif
+#ifdef HAVE_LIBMINGWEX
+# ifndef INSTALLING                             /* Bundled Mingw is behind */
+                              ,"mingwex"
+# endif
+#endif
 #if defined(THREADED_RTS) && !defined(mingw32_TARGET_OS)
 			      ,"pthread"
 # ifdef osf3_TARGET_OS
diff --git a/mk/config.h.in b/mk/config.h.in
index 837e852879..7631924103 100644
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -649,6 +649,9 @@
 /* Define if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
+/* Define if you have the mingwex library. */
+#undef HAVE_MINGWEX
+
 /* Define if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index f36f483981..4ba14bafae 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -676,6 +676,11 @@ HaveLibGmp	= @HaveLibGmp@
 LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
+# Mingwex Library
+#
+HaveLibMingwEx	= @HaveLibMingwEx@
+
+#-----------------------------------------------------------------------------
 # Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #