X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=be31d6907f3dc9ae5eb61c71a50ed5821cc1d8b0;hb=003bc7cbbec233a047ce899b0ec6ebd2816752ed;hp=7e6bb90dd8927306ac00ee1e8f3096714d1a6a39;hpb=90e59feec13d702a5c3c36a3a95fd3d4566af35a;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 7e6bb90..be31d69 100644
--- a/configure.in
+++ b/configure.in
@@ -207,6 +207,7 @@ i[[3456]]86-*-mingw32*)
 	# the gcc command-line used here with -mno-cygwin -mwin32
 	# to arrange for good things to happen.
 	CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
+	CPPFLAGS="-mno-cygwin -mwin32 $CPPFLAGS"
         ;;
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
@@ -433,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,
@@ -478,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)
@@ -527,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