X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=eb63052bff2d30c9d51bee78ba9439851f56330b;hb=11d4f6867b6a1088eeb809c4520ea1e40b1e68f4;hp=d56688d42a5687f8d7ca79244c0cedd04535f1e2;hpb=1cce2f51656cfbd8c7933a914a4bd981792aa1e6;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index d56688d..eb63052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -685,15 +685,8 @@ AC_ARG_ENABLE(bootstrap-with-devel-snapshot,
 if test "$WithGhc" != ""; then
   FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])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
+  if test "$GhcMajVersion" = "unknown" -o "$GhcMinVersion" = "unknown"; then
+     AC_MSG_ERROR([Cannot determine the version of $WithGhc.  Is it really GHC?])
   fi
 
   AC_SUBST(GhcVersion)dnl
@@ -825,6 +818,17 @@ if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then
   fi
   FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.6],
     [AC_MSG_ERROR([GHC version 6.6 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;
 
 # This uses GHC, so put it after the "GHC is required" check above:
@@ -1000,10 +1004,11 @@ fi
 dnl ** check for DocBook toolchain
 FP_CHECK_DOCBOOK_DTD
 FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl])
-FP_PROG_FO_PROCESSOR
 
 FP_PROG_DBLATEX
 
+FP_PROG_HSTAGS
+
 dnl ** check for ghc-pkg command
 FP_PROG_GHC_PKG
 
@@ -1299,7 +1304,7 @@ else
 fi
 AC_SUBST(HavePapi)
 
-if test "$DIR_DOCBOOK_XSL" = "" -o
+if test "$DIR_DOCBOOK_XSL" = "" ||
    test "$XsltprocCmd" = ""
 then
     BUILD_DOCBOOK_HTML=NO