Error message wibble

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c6ce56c..14d8710 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,22 @@ AC_ARG_WITH([ghc],
   fi
   WithGhc="$GHC"])
 
+dnl ** Booting from .hc files?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(hc-boot,
+[AC_HELP_STRING([--enable-hc-boot],
+[Boot the Glasgow Haskell Compiler from intermediate .hc files.
+ (This option is mostly of interest to porters.) [default=no]])],
+[ if test x"$enableval" = x"yes"; then
+        BootingFromHc=YES
+  else
+        BootingFromHc=NO
+  fi
+],
+[BootingFromHc=NO]
+)
+AC_SUBST(BootingFromHc)
+
 dnl ** Booting from unregisterised .hc files?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hc-boot-unregisterised,
@@ -112,26 +128,6 @@ AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
 fi;
 fi;
 
-dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
-if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then
-  if test "$WithGhc" = ""; then
-     AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
-  fi
-  FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.8],
-    [AC_MSG_ERROR([GHC version 6.8 or later is required to compile GHC.])])dnl
-
-  if test `expr $GhcMinVersion % 2` = "1"; then
-     echo $EnableBootstrapWithDevelSnaphost
-     if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then
-        AC_MSG_ERROR([
-     $WithGhc is a development snapshot of GHC, version $GhcVersion.
-     Bootstrapping using this version of GHC is not supported, and may not
-     work.  Use --enable-bootstrap-with-devel-snapshot to try it anyway,
-     or --with-ghc to specify a different GHC to use.])
-     fi
-  fi
-fi;
-
 AC_ARG_ENABLE(bootstrap-with-devel-snapshot,
 [AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot],
                 [Allow bootstrapping using a development snapshot of GHC.  This is not guaranteed to work.])],
@@ -156,6 +152,25 @@ if test "$WithGhc" != ""; then
   AC_SUBST(ghc_ge_609)dnl
 fi
 
+dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
+if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then
+  if test "$WithGhc" = ""; then
+     AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+  fi
+  FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.8],
+    [AC_MSG_ERROR([GHC version 6.8 or later is required to compile GHC.])])dnl
+
+  if test `expr $GhcMinVersion % 2` = "1"; then
+     if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then
+        AC_MSG_ERROR([
+     $WithGhc is a development snapshot of GHC, version $GhcVersion.
+     Bootstrapping using this version of GHC is not supported, and may not
+     work.  Use --enable-bootstrap-with-devel-snapshot to try it anyway,
+     or --with-ghc to specify a different GHC to use.])
+     fi
+  fi
+fi;
+
 # GHC is passed to Cabal, so we need a native path
 if test "${WithGhc}" != ""
 then
@@ -242,6 +257,10 @@ case $host in
     ;;
 i386-apple-darwin|powerpc-apple-darwin)
     soext='.dylib'
+    CFLAGS="$CFLAGS -m32"
+    LDFLAGS="$LDFLAGS -m32"
+    SRC_CC_OPTS="$SRC_CC_OPTS -m32"
+    SRC_LD_OPTS="$SRC_LD_OPTS -m32"
     ;;
 x86_64-apple-darwin)
     soext='.dylib'
@@ -396,52 +415,6 @@ AC_ARG_WITH(ld,
  [FP_PROG_LD()]
 )
 
-dnl ** Build shared and/or static libs?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(shared,
-[AC_HELP_STRING([--enable-shared],
-[Build shared libraries, if available (EXPERIMENTAL, non-working). [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time])
-        BuildSharedLibs=YES
-  else
-        BuildSharedLibs=NO
-  fi
-],
-[BuildSharedLibs=NO]
-)
-AC_SUBST(BuildSharedLibs)
-
-# ToDo later:
-# AC_ARG_ENABLE(static,
-# [AC_HELP_STRING([--enable-static],
-# [Build static libraries. [default=yes]])],
-# [ if test x"$enableval" = x"yes"; then
-#         BuildStaticLibs=YES
-#   else
-#         BuildStaticLibs=NO
-#   fi
-# ],
-# [BuildStaticLibs=YES]
-# )
-# AC_SUBST(BuildStaticLibs)
-
-dnl ** Booting from .hc files?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(hc-boot,
-[AC_HELP_STRING([--enable-hc-boot],
-[Boot the Glasgow Haskell Compiler from intermediate .hc files.
- (This option is mostly of interest to porters.) [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        BootingFromHc=YES
-  else
-        BootingFromHc=NO
-  fi
-],
-[BootingFromHc=NO]
-)
-AC_SUBST(BootingFromHc)
-
 # This uses GHC, so put it after the "GHC is required" check above:
 FP_FIND_ROOT
 
@@ -896,7 +869,7 @@ if grep '   ' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
-AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
 
@@ -966,9 +939,7 @@ fi
 echo ["\
    Building DocBook HTML documentation : $BUILD_DOCBOOK_HTML
    Building DocBook PS documentation   : $BUILD_DOCBOOK_PS
-   Building DocBook PDF documentation  : $BUILD_DOCBOOK_PDF
-
-   Building shared libraries           : $BuildSharedLibs"]
+   Building DocBook PDF documentation  : $BUILD_DOCBOOK_PDF"]
 
 echo ["----------------------------------------------------------------------
 "]