[project @ 2003-09-03 11:15:19 by simonmar]

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c8e75b0..b8d1116 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,9 @@ AC_PREREQ(2.52)
 dnl * Declare subdirectories that have a private configure script
 dnl
 dnl After the toplevel configuration is complete, the script will recurse into
-dnl these subdirectories (the use of cache values makes repeated checks cheap)
-dnl (We probably have to add hslibs/{OpenGL,GLUT} here later...)
-AC_CONFIG_SUBDIRS(ghc)
+dnl these subdirectories if they exist. The use of a cache file makes repeated
+dnl checks cheap.
+AC_CONFIG_SUBDIRS([ghc libraries])
 
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
@@ -206,6 +206,15 @@ ia64-*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+x86_64-*-linux*)
+        HostPlatform=x86_64-unknown-linux
+        TargetPlatform=x86_64-unknown-linux
+        BuildPlatform=x86_64-unknown-linux
+        HostPlatform_CPP='x86_64_unknown_linux'
+        HostArch_CPP='x86_64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='linux'
+       ;;
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
         HostArch_CPP='m68k'
@@ -236,13 +245,13 @@ m68k-*-openbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
-m68k-apple-netbsd*)
-       HostPlatform=m68k-apple-netbsd
-       TargetPlatform=m68k-apple-netbsd
-       BuildPlatform=m68k-apple-netbsd
-        HostPlatform_CPP='m68k_apple_netbsd'
+m68k-*-netbsd*)
+       HostPlatform=m68k-unknown-netbsd
+       TargetPlatform=m68k-unknown-netbsd
+       BuildPlatform=m68k-unknown-netbsd
+        HostPlatform_CPP='m68k_unknown_netbsd'
         HostArch_CPP='m68k'
-        HostVendor_CPP='apple'
+        HostVendor_CPP='unknown'
         HostOS_CPP='netbsd'
         ;;
 m68k-sun-sunos4*)
@@ -681,9 +690,6 @@ dnl ** check for tar
 dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
-dnl ** check for gzip/compress
-AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
-
 dnl ** check for jade/openjade & determine a working catalog
 AC_PATH_PROGS(JadeCmd,openjade jade,jade)
 FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
@@ -707,15 +713,6 @@ case $Catalog in
 esac   
 AC_SUBST(Catalog)
 
-compress_nm=`basename $CompressCmd`
-if test x"$compress_nm" = xgzip; then
-  CompressCmd="$CompressCmd -d"
-  CompressSuffix="gz"
-else
-  CompressSuffix="Z"
-fi
-AC_SUBST(CompressCmd)
-AC_SUBST(CompressSuffix)
 
 dnl ** check for ghc-pkg command
 changequote(, )dnl
@@ -730,10 +727,10 @@ fi
 
 AC_ARG_WITH(greencard,
 [  --with-greencard=<greencard compiler>
-        Use a command different from 'green-card' to compile GreenCard files
+        Use a command different from 'greencard' to compile GreenCard files
 ],
 [
-GreencardCmd=$withval;
+GreenCardCmd=$withval;
 FPTOOLS_GREENCARD(3.00)
 ]
 )