X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=3c945a452375fe010484cca25164cc0024b5f4ec;hb=30b24ded6ed997a892bb62cbf1479ef047fbac01;hp=4d40247a072c9040992596a70ead5d7e6072c825;hpb=35e4455c8780aa03bdc5bd9bee6db3fa9f21ad07;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 4d40247..3c945a4 100644
--- a/configure.in
+++ b/configure.in
@@ -510,9 +510,6 @@ AC_PROG_CPP
 
 dnl ** does the C compiler support the following options?
 FPTOOLS_CC_FLAG(-mwin32,CC_SUPPORTS_MWIN32)
-if test -n "$CC_SUPPORS_MWIN32"; then
-  AC_MSG_ERROR([A mingwin gcc is required to build GHC on Windows.])
-fi
 FPTOOLS_CC_FLAG(-mno-cygwin,CC_SUPPORTS_MNO_CYGWIN)
 
 EXTRA_CC_OPTS="$CC_SUPPORTS_MNO_CYGWIN $CC_SUPPORTS_MWIN32"
@@ -568,10 +565,18 @@ AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
 dnl ** check for jade/openjade & determine a working catalog
 AC_PATH_PROGS(JadeCmd,openjade jade,jade)
 FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
-                        /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
+                        /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl glafp-utils/docbook/CATALOG*)
 if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi
+case $HostOS_CPP in
+   mingw32)
+      Catalog=`cygpath -w $hardtop/$Catalog`
+      ;;
+   *)
+      Catalog=$hardtop/$Catalog
+      ;;
+esac   
 AC_SUBST(Catalog)
 
 compress_nm=`basename $CompressCmd`