[project @ 2001-07-23 22:19:59 by ken]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index b7ff483..edbd886 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -429,20 +429,6 @@ if test x"$EnableWin32DLLs" = "xYES" ; then
  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 fi
 
-dnl ** Building a Win32-friendlier compiler?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(minimal-unix-deps,
-[  --enable-minimal-unix-deps
-        Build a compiler that minimizes dependencies on Unix-like tools
-       under Win32, allowing the user to operate the compiler without
-       having to install Cygwin toolchain (say). (You still need
-       that toolchain to build GHC from sources though).
-],
-[MinimalUnixDeps=YES],
-[MinimalUnixDeps=NO]
-)
-AC_SUBST(MinimalUnixDeps)
-
 dnl ** Enable the building of the OpenGL/GLUT binding in hslibs?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hopengl,
@@ -579,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`
@@ -938,7 +932,9 @@ AC_C_PROTOTYPES
 dnl ** are we big endian?
 AC_C_BIGENDIAN
 # Allay users' general fear of warnings of any kind.
-errprint((fptools configure script wizard sez: "don't worry, the above warning is harmless (to us.)")
+errprint(fptools configure script wizard sez: autoconf-2.50 or later should produce no warnings
+)
+errprint(if you are using 2.13 or earlier, you may get a (harmless) warning message.
 )
 
 dnl ** check for leading underscores in symbol names