From: Simon Marlow <marlowsd@gmail.com>
Date: Wed, 13 May 2009 10:03:17 +0000 (+0000)
Subject: remove old unused fop/dvips/xmltex stuff
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=36cef1ea7f7e2dd68063598cdc23c4d1456f38ca;p=ghc-hetmet.git

remove old unused fop/dvips/xmltex stuff
---

diff --git a/aclocal.m4 b/aclocal.m4
index 9984eae..c46d48d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -906,33 +906,6 @@ AC_SUBST([FopCmd])
 ])# FP_PROG_FOP
 
 
-# FP_PROG_FO_PROCESSOR
-# --------------------
-# Try to find an FO processor. PassiveTeX output is sometimes a bit strange, so
-# try FOP first. Sets the output variables FopCmd, XmltexCmd, DvipsCmd, and
-# PdfxmltexCmd.
-AC_DEFUN([FP_PROG_FO_PROCESSOR],
-[AC_REQUIRE([FP_PROG_FOP])
-AC_PATH_PROG([XmltexCmd], [xmltex])
-AC_PATH_PROG([DvipsCmd], [dvips])
-if test -z "$FopCmd"; then
-  if test -z "$XmltexCmd"; then
-    AC_MSG_WARN([cannot find an FO => DVI converter, you will not be able to build DVI or PostScript documentation])
-  else
-    if test -z "$DvipsCmd"; then
-      AC_MSG_WARN([cannot find a DVI  => PS converter, you will not be able to build PostScript documentation])
-    fi
-  fi
-  AC_PATH_PROG([PdfxmltexCmd], [pdfxmltex])
-  if test -z "$PdfxmltexCmd"; then
-    AC_MSG_WARN([cannot find an FO => PDF converter, you will not be able to build PDF documentation])
-  fi
-elif test -z "$XmltexCmd"; then
-  AC_MSG_WARN([cannot find an FO => DVI converter, you will not be able to build DVI documentation])
-fi
-])# FP_PROG_FO_PROCESSOR
-
-
 # FP_PROG_GHC_PKG
 # ----------------
 # Try to find a ghc-pkg matching the ghc mentioned in the environment variable
diff --git a/configure.ac b/configure.ac
index f3f62a0..57d3d31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1000,7 +1000,6 @@ 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
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 43a54e3..552a27e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -898,10 +898,6 @@ BUILD_DOCBOOK_PDF = @BUILD_DOCBOOK_PDF@
 DBLATEX		= @DblatexCmd@
 XSLTPROC		= @XsltprocCmd@
 XMLLINT			= @XmllintCmd@
-FOP			= @FopCmd@
-XMLTEX			= @XmltexCmd@
-PDFXMLTEX		= @PdfxmltexCmd@
-DVIPS			= @DvipsCmd@
 
 DIR_DOCBOOK_XSL		= @DIR_DOCBOOK_XSL@