Add recently added lib dirs to the darcs boring file

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 96c110f..d2cea57 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -292,10 +292,10 @@ BuildPlatform=$build
 BuildArch=`echo "$build" | sed 's/-.*//'`
 BuildVendor=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/'`
 BuildOS=`echo "$build" | sed 's/.*-//'`
-BuildPlatform_CPP=`echo "$BuildPlatform" | sed 's/\.\|-/_/g'`
-BuildArch_CPP=`echo "$BuildArch" | sed 's/\.\|-/_/g'`
-BuildVendor_CPP=`echo "$BuildVendor" | sed 's/\.\|-/_/g'`
-BuildOS_CPP=`echo "$BuildOS" | sed 's/\.\|-/_/g'`
+BuildPlatform_CPP=`echo "$BuildPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'`
+BuildArch_CPP=`    echo "$BuildArch"     | sed -e 's/\./_/g' -e 's/-/_/g'`
+BuildVendor_CPP=`  echo "$BuildVendor"   | sed -e 's/\./_/g' -e 's/-/_/g'`
+BuildOS_CPP=`      echo "$BuildOS"       | sed -e 's/\./_/g' -e 's/-/_/g'`
 
 checkArch "$BuildArch"
 checkVendor "$BuildVendor"
@@ -305,10 +305,10 @@ HostPlatform=$host
 HostArch=`echo "$host" | sed 's/-.*//'`
 HostVendor=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/'`
 HostOS=`echo "$host" | sed 's/.*-//'`
-HostPlatform_CPP=`echo "$HostPlatform" | sed 's/\.\|-/_/g'`
-HostArch_CPP=`echo "$HostArch" | sed 's/\.\|-/_/g'`
-HostVendor_CPP=`echo "$HostVendor" | sed 's/\.\|-/_/g'`
-HostOS_CPP=`echo "$HostOS" | sed 's/\.\|-/_/g'`
+HostPlatform_CPP=`echo "$HostPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'`
+HostArch_CPP=`    echo "$HostArch"     | sed -e 's/\./_/g' -e 's/-/_/g'`
+HostVendor_CPP=`  echo "$HostVendor"   | sed -e 's/\./_/g' -e 's/-/_/g'`
+HostOS_CPP=`      echo "$HostOS"       | sed -e 's/\./_/g' -e 's/-/_/g'`
 
 checkArch "$HostArch"
 checkVendor "$HostVendor"
@@ -318,10 +318,10 @@ TargetPlatform=$target
 TargetArch=`echo "$target" | sed 's/-.*//'`
 TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'`
 TargetOS=`echo "$target" | sed 's/.*-//'`
-TargetPlatform_CPP=`echo "$TargetPlatform" | sed 's/\.\|-/_/g'`
-TargetArch_CPP=`echo "$TargetArch" | sed 's/\.\|-/_/g'`
-TargetVendor_CPP=`echo "$TargetVendor" | sed 's/\.\|-/_/g'`
-TargetOS_CPP=`echo "$TargetOS" | sed 's/\.\|-/_/g'`
+TargetPlatform_CPP=`echo "$TargetPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'`
+TargetArch_CPP=`    echo "$TargetArch"     | sed -e 's/\./_/g' -e 's/-/_/g'`
+TargetVendor_CPP=`  echo "$TargetVendor"   | sed -e 's/\./_/g' -e 's/-/_/g'`
+TargetOS_CPP=`      echo "$TargetOS"       | sed -e 's/\./_/g' -e 's/-/_/g'`
 
 checkArch "$TargetArch"
 checkVendor "$TargetVendor"
@@ -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
 
@@ -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 ["----------------------------------------------------------------------
 "]