X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=f1cd4ca50446447507e1603dfcdee9cbc9d867ca;hb=f4ec2d0cad2994715116ab71b05e7af303d31921;hp=37dbc72bb292fbe07f2a2201e176a5d89d87414c;hpb=178a52ac5f702fa8644c0fd62eb364991ba3bbd1;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 37dbc72..f1cd4ca 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
@@ -992,10 +991,12 @@ echo ["\
       which is version   : $GccVersion
 
    ld       : $LdCmd
-   Happy    : $HappyCmd
-   Alex     : $AlexCmd
+   Happy    : $HappyCmd ($HappyVersion)
+   Alex     : $AlexCmd ($AlexVersion)
    Python   : $PythonCmd
-   Perl     : $PerlCmd"]
+   Perl     : $PerlCmd
+   dblatex  : $DblatexCmd
+   xsltproc : $XsltprocCmd"]
 
 if test "$HSCOLOUR" = ""; then
 echo ["
@@ -1007,11 +1008,12 @@ echo ["\
 "]
 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 DocBook HTML documentation : $BUILD_DOCBOOK_HTML
+   Building DocBook PS documentation   : $BUILD_DOCBOOK_PS
+   Building DocBook PDF documentation  : $BUILD_DOCBOOK_PDF
 
-echo ["Building shared libraries      : $BuildSharedLibs"]
+   Building shared libraries           : $BuildSharedLibs"]
 
 echo ["----------------------------------------------------------------------
 "]