X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=d2cea57d4880cc2636025dcf074e5f27269e40f4;hp=f259ada71226bda1e045a275f83632cfb3a2a48d;hb=1d141bd52e6eea321e90cd11059f726094dd50be;hpb=82fbc4be78c26dca06d3ff4a4b3ddc9a394edbd0

diff --git a/configure.ac b/configure.ac
index f259ada..d2cea57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,9 +160,7 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
-  if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
-  AC_SUBST(ghc_ge_607)dnl
   AC_SUBST(ghc_ge_609)dnl
 fi
 
@@ -237,7 +235,7 @@ fi
 
 exeext=''
 soext='.so'
-case $HostPlatform in
+case $host in
 *-unknown-cygwin32)
     AC_MSG_WARN([GHC does not support the Cygwin target at the moment])
     AC_MSG_WARN([I'm assuming you wanted to build for i386-unknown-mingw32])
@@ -257,23 +255,77 @@ x86_64-apple-darwin)
     ;;
 esac
 
+checkArch() {
+    case $1 in
+    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
+        ;;
+    *)
+        echo "Unknown arch $1"
+        exit 1
+        ;;
+    esac
+}
+
+checkVendor() {
+    case $1 in
+    dec|unknown|hp|apple|next|sun|sgi|ibm)
+        ;;
+    *)
+        echo "Unknown vendor $1"
+        exit 1
+        ;;
+    esac
+}
+
+checkOS() {
+    case $1 in
+    linux|freebsd|netbsd|openbsd|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+        ;;
+    *)
+        echo "Unknown OS $1"
+        exit 1
+        ;;
+    esac
+}
+
 BuildPlatform=$build
-BuildPlatform_CPP=`echo "$build" | sed 's/\.\|-/_/g'`
-BuildArch_CPP=`echo "$build" | sed 's/-.*//' | sed 's/\.\|-/_/g'`
-BuildVendor_CPP=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/' | sed 's/\.\|-/_/g'`
-BuildOS_CPP=`echo "$build" | sed 's/.*-//' | sed 's/\.\|-/_/g'`
+BuildArch=`echo "$build" | sed 's/-.*//'`
+BuildVendor=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/'`
+BuildOS=`echo "$build" | sed 's/.*-//'`
+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"
+checkOS "$BuildOS"
 
 HostPlatform=$host
-HostPlatform_CPP=`echo "$host" | sed 's/\.\|-/_/g'`
-HostArch_CPP=`echo "$host" | sed 's/-.*//' | sed 's/\.\|-/_/g'`
-HostVendor_CPP=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/' | sed 's/\.\|-/_/g'`
-HostOS_CPP=`echo "$host" | sed 's/.*-//' | sed 's/\.\|-/_/g'`
+HostArch=`echo "$host" | sed 's/-.*//'`
+HostVendor=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/'`
+HostOS=`echo "$host" | sed 's/.*-//'`
+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"
+checkOS "$HostOS"
 
 TargetPlatform=$target
-TargetPlatform_CPP=`echo "$target" | sed 's/\.\|-/_/g'`
-TargetArch_CPP=`echo "$target" | sed 's/-.*//' | sed 's/\.\|-/_/g'`
-TargetVendor_CPP=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/' | sed 's/\.\|-/_/g'`
-TargetOS_CPP=`echo "$target" | sed 's/.*-//' | sed 's/\.\|-/_/g'`
+TargetArch=`echo "$target" | sed 's/-.*//'`
+TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'`
+TargetOS=`echo "$target" | sed 's/.*-//'`
+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"
+checkOS "$TargetOS"
 
 AC_SUBST(BuildPlatform)
 AC_SUBST(HostPlatform)
@@ -569,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
@@ -870,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
@@ -890,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
 
@@ -940,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 ["
@@ -955,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 ["----------------------------------------------------------------------
 "]