X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=be31d6907f3dc9ae5eb61c71a50ed5821cc1d8b0;hb=420f5413c8dfd2aaf07e28ef1fe9e37c8a0678bf;hp=21eea5f87136e2f7307e87b48eba366e5f428739;hpb=e7523c0c3ad4a56c06cede0f0825c2b7977d1f47;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 21eea5f..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
@@ -598,7 +613,7 @@ dnl ** check for full ANSI header (.h) files
 AC_HEADER_STDC
 
 dnl ** check for specific header (.h) files that we are interested in
-AC_CHECK_HEADERS(Files.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h bfd.h winsock.h)
+AC_CHECK_HEADERS(Files.h arpa/inet.h assert.h console.h ctype.h dirent.h errno.h fcntl.h float.h ftw.h grp.h ieee754.h inttypes.h malloc.h memory.h nlist.h pascal.h pwd.h sgtty.h siginfo.h signal.h stat.h stdint.h stdlib.h stdarg.h string.h sys/fault.h sys/file.h sys/ioctl.h sys/limits.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/un.h sys/utsname.h sys/vadvise.h sys/wait.h termio.h termios.h time.h types.h unistd.h utime.h values.h vfork.h bfd.h winsock.h)
 
 AC_CHECK_HEADER(readline/readline.h, HaveReadlineReadlineH=YES, HaveReadlineReadlineH=NO)
 AC_CHECK_HEADER(readline/history.h, HaveReadlineHistoryH=YES, HaveReadlineHistoryH=NO)
@@ -840,7 +855,7 @@ fi
 
 if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then
   AC_DEFINE(HAVE_READLINE_LIBS,1)
-  LibsReadline="-lreadline -l$LibTermcap"
+  LibsReadline="readline $LibTermcap"
 else
   AC_DEFINE(HAVE_READLINE_LIBS,0)
   LibsReadline=