X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=f0376d9f3638f07a22aa16150b6f54cdd4868121;hb=d5a43d65c49456ddfe129e36e21cf4326f138149;hp=2e7f1eff7cfebbde001087494649f6b8e37b67dd;hpb=130677d4d4443949d1bd9be5abc7b194e5596ce1;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 2e7f1ef..f0376d9 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,7 @@ exeext=''
 # We also record the architecture, vendor, and operating system (OS)
 # separately.
 case $HostPlatform in
-alpha-dec-osf[[12]]*)
+alpha*-dec-osf[[12]]*)
 	HostPlatform=alpha-dec-osf1   # canonicalise for our purposes
 	TargetPlatform=alpha-dec-osf1 # this will work for now... (hack)
 	BuildPlatform=alpha-dec-osf1  # hack
@@ -84,7 +84,7 @@ alpha-dec-osf[[12]]*)
         HostVendor_CPP='dec'
         HostOS_CPP='osf1'
         ;;
-alpha-dec-osf[[34]]*)
+alpha*-dec-osf[[345]]*)
 	HostPlatform=alpha-dec-osf3   # canonicalise for our purposes
 	TargetPlatform=alpha-dec-osf3 # this will work for now... (hack)
 	BuildPlatform=alpha-dec-osf3  # hack
@@ -93,7 +93,7 @@ alpha-dec-osf[[34]]*)
         HostVendor_CPP='dec'
         HostOS_CPP='osf3'
         ;;
-alpha-unknown-linux)
+alpha*-unknown-linux)
 	HostPlatform=alpha-unknown-linux
 	TargetPlatform=alpha-unknown-linux
 	BuildPlatform=alpha-unknown-linux
@@ -102,7 +102,7 @@ alpha-unknown-linux)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
-alpha-unknown-freebsd*)
+alpha*-unknown-freebsd*)
 	HostPlatform=alpha-unknown-freebsd
 	TargetPlatform=alpha-unknown-freebsd
 	BuildPlatform=alpha-unknown-freebsd
@@ -404,6 +404,25 @@ AC_ARG_ENABLE(hc-boot,
 )
 AC_SUBST(BootingFromHc)
 
+dnl ** Booting from unregisterised .hc files?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(hc-boot-unregisterised,
+[  --enable-hc-boot-unregisterised
+        With --enable-hc-boot, treat the intermediate .hc files as
+        unregisterised rather than registerised code.
+        (This option is mostly of interest to porters.)
+],
+[BootingFromUnregisterisedHc=YES],
+[BootingFromUnregisterisedHc=NO]
+)
+AC_SUBST(BootingFromUnregisterisedHc)
+
+if test "$BootingFromHc" = "NO"; then
+if test "$BootingFromUnregisterisedHc" = "YES"; then
+AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
+fi;
+fi;
+
 
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
@@ -569,7 +588,17 @@ FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl,
 if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi
-Catalog=$hardtop/$Catalog
+case $Catalog in
+   glafp*) 
+	case $HostOS_CPP in
+	   mingw32)
+	      Catalog=`cygpath -w $hardtop/$Catalog`
+	      ;;
+	   *) Catalog=$hardtop/$Catalog
+	      ;;
+	esac
+   ;;
+esac   
 AC_SUBST(Catalog)
 
 compress_nm=`basename $CompressCmd`
@@ -600,7 +629,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 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_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 limits.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)
@@ -810,7 +839,7 @@ AC_CHECK_FUNCS(pclose    _pclose )
 
 
 dnl ** check for specific library functions that we are interested in
-AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat symlink sysconf timelocal times vadvise vfork)
+AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat symlink sysconf timelocal times vadvise vfork localtime_r gmtime_r)
 
 dnl ** check whether this machine has gmp3 installed
 AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
@@ -925,7 +954,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