[project @ 2001-06-06 12:04:46 by simonmar]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index 2e5581e..be31d69 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -156,15 +156,6 @@ i[[3456]]86-*-freebsd2*) # Older FreeBSDs are a.out
         HostVendor_CPP='unknown'
         HostOS_CPP='freebsd2'
         ;;
-i[[3456]]86-*-netbsd1\.[0-4]) # Older NetBSDs are a.out
-       HostPlatform=i386-unknown-netbsdaout # hack again
-       TargetPlatform=i386-unknown-netbsdaout
-       BuildPlatform=i386-unknown-netbsdaout
-        HostPlatform_CPP='i386_unknown_netbsdaout'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='netbsd'
-        ;;
 i[[3456]]86-*-netbsd*)
        HostPlatform=i386-unknown-netbsd # hack again
        TargetPlatform=i386-unknown-netbsd
@@ -443,6 +434,20 @@ 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,
@@ -488,12 +493,12 @@ AC_SYS_INTERPRETER()
 dnl ** look for `perl', but only in /bin on Windows
 case $HostOS_CPP in
 cygwin32|mingw32)
-   AC_CHECK_PROG(PerlCmd,perl,/bin/perl,,/bin)
-   if test -z "$PerlCmd"; then
-      echo "You must install the version of Perl shipped with GHC"
-      echo "(or a compatible one) in /bin."
-      exit 1
-   fi
+      AC_CHECK_PROG(PerlCmd,perl,/bin/perl,,/bin)
+      if test -z "$PerlCmd"; then
+         echo "You must install the version of Perl shipped with GHC"
+         echo "(or a compatible one) in /bin."
+         exit 1
+      fi
    ;;
 *)
    AC_PATH_PROG(PerlCmd,perl)
@@ -537,10 +542,10 @@ dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing
 dnl  on the suitability of the 'yacc' returned.)
 FPTOOLS_PROG_YACCY
 
-dnl ** Find lex command (lex or flex) and library (-ll or -lfl)
-dnl     ( not that we care about the latter, see mk/config.mk.in )
-AC_PROG_LEX
-
+dnl ** Find lex command (lex or flex) - *doesn't* use autoconf's
+dnl    AC_PROG_LEX, since it doesn't actually check whether 'lex'
+dnl    exists if 'flex' doesn't.
+AC_PROG_LEX_STRICT
 
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL