X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=eb63052bff2d30c9d51bee78ba9439851f56330b;hp=e2626a2f3d30cb91a1f393c1c2c4eda03b47b689;hb=6efacfe8bcbe66dfc3b52397ccbd34a58890520d;hpb=34cc75e1a62638f2833815746ebce0a9114dc26b

diff --git a/configure.ac b/configure.ac
index e2626a2..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
@@ -708,25 +701,6 @@ if test "$WithGhc" != ""; then
   AC_SUBST(ghc_ge_609)dnl
 fi
 
-# Check whether this GHC has editline installed
-FP_GHC_HAS_EDITLINE
-
-# Dummy arguments to print help for --with-editline-* arguments.
-# Those are actually passed to the editline package's configure script
-# via the CONFIGURE_ARGS variable in mk/config.mk
-AC_ARG_WITH(dummy-editline-includes,
-  [AC_HELP_STRING([--with-editline-includes],
-    [directory containing editline/editline.h or editline/readline.h])],
-    [],
-    [])
-
-AC_ARG_WITH(dummy-editline-libraries,
-  [AC_HELP_STRING([--with-editline-libraries],
-    [directory containing the editline library])],
-    [],
-    [])
-
-
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -844,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:
@@ -1019,7 +1004,10 @@ 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
@@ -1316,6 +1304,26 @@ else
 fi
 AC_SUBST(HavePapi)
 
+if test "$DIR_DOCBOOK_XSL" = "" ||
+   test "$XsltprocCmd" = ""
+then
+    BUILD_DOCBOOK_HTML=NO
+else
+    BUILD_DOCBOOK_HTML=YES
+fi
+AC_SUBST(BUILD_DOCBOOK_HTML)
+
+if test "$DblatexCmd" = ""
+then
+    BUILD_DOCBOOK_PS=NO
+    BUILD_DOCBOOK_PDF=NO
+else
+    BUILD_DOCBOOK_PS=YES
+    BUILD_DOCBOOK_PDF=YES
+fi
+AC_SUBST(BUILD_DOCBOOK_PS)
+AC_SUBST(BUILD_DOCBOOK_PDF)
+
 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])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
@@ -1381,17 +1389,11 @@ echo ["\
 "]
 fi
 
-if test "$DIR_DOCBOOK_XSL" = ""; then
-echo ["\
-   Building DocBook documentation : no"]
-else
-echo ["\
-   Building DocBook documentation : yes"]
-fi
-
+echo "Building DocBook HTML documentation: $BUILD_DOCBOOK_HTML"
+echo "Building DocBook PS documentation:   $BUILD_DOCBOOK_PS"
+echo "Building DocBook PDF documentation:  $BUILD_DOCBOOK_PDF"
 
-echo ["\
-   Building shared libraries      : $BuildSharedLibs"]
+echo ["Building shared libraries      : $BuildSharedLibs"]
 
 echo ["----------------------------------------------------------------------
 "]