X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=a35ad4a1c7425383d3d88de0db4917e450bc15e2;hb=27d13cb655147c28eeed0f06cac6fc40c5d778aa;hp=3c6316a890c5f81d53b96a6a1d94a255e41f10e4;hpb=2a71c0abb2f7233236c1c956b6d63308014f1868;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 3c6316a..a35ad4a 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
@@ -386,7 +386,8 @@ AC_ARG_WITH(gcc,
 [  --with-gcc=<gcc command>
         Use a different command instead of 'gcc' for the GNU C compiler.
 ],
-[WhatGccIsCalled="$withval"],
+[WhatGccIsCalled="$withval"
+ CC="$withval"],
 [WhatGccIsCalled="gcc"]
 )
 AC_SUBST(WhatGccIsCalled)
@@ -403,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 --------------------------------------------------------------
@@ -428,20 +448,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,
@@ -578,10 +584,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`
@@ -937,7 +951,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