X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=d2cea57d4880cc2636025dcf074e5f27269e40f4;hb=a0f529668437c84f2aaf744b5abc373de9e264e4;hp=6aa6361a49d645fae945318e4af72e99b74a1b2b;hpb=c9a11cb4d01d33d7e728fcc8c842d810894b0c5a;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 6aa6361..d2cea57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,8 +621,7 @@ 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_DOCBOOK_XSL
 FP_PROG_DBLATEX
 
 FP_PROG_HSTAGS
@@ -922,7 +921,7 @@ else
 fi
 AC_SUBST(HavePapi)
 
-if test "$DIR_DOCBOOK_XSL" = "" ||
+if test "$HAVE_DOCBOOK_XSL" = "NO" ||
    test "$XsltprocCmd" = ""
 then
     BUILD_DOCBOOK_HTML=NO
@@ -942,7 +941,7 @@ 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_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_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT