[project @ 1998-02-05 12:23:33 by simonm]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index 034f7fb..7560289 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ fi
 # Remove some automounter nonsense (Glasgow specific gruff)
 #
 hardtop=`pwd`
-hardtop=`echo $hardtop | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|'`
+hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|'`
 
 echo ''
 echo "*** The top of your build tree is: $hardtop"
@@ -66,13 +66,15 @@ if test x"$TargetPlatform" != x"$HostPlatform" ; then
     echo "GHC configuration does not support differing host/target (i.e., cross-compiling)"
     exit 1
 fi
+
+exeext=''
 #
 # The following will be more difficult when we *are* cross-compiling.
 # Suitable names to slam in *_CPP are in platform.h.in.
 # We also record the architecture, vendor, and operating system (OS)
 # separately.
 case $HostPlatform in
-alpha-dec-osf[[1234]]*)
+alpha-dec-osf[[12]]*)
        HostPlatform=alpha-dec-osf1   # canonicalise for our purposes
        TargetPlatform=alpha-dec-osf1 # this will work for now... (hack)
        BuildPlatform=alpha-dec-osf1  # hack
@@ -81,6 +83,15 @@ alpha-dec-osf[[1234]]*)
         HostVendor_CPP='dec'
         HostOS_CPP='osf1'
         ;;
+alpha-dec-osf[[34]]*)
+       HostPlatform=alpha-dec-osf3   # canonicalise for our purposes
+       TargetPlatform=alpha-dec-osf3 # this will work for now... (hack)
+       BuildPlatform=alpha-dec-osf3  # hack
+        HostPlatform_CPP='alpha_dec_osf3'
+        HostArch_CPP='alpha'
+        HostVendor_CPP='dec'
+        HostOS_CPP='osf3'
+        ;;
 hppa1.1-hp-hpux*)
        HostPlatform=hppa1.1-hp-hpux  # canonicalise for our purposes (hack)
        TargetPlatform=hppa1.1-hp-hpux
@@ -143,6 +154,7 @@ i[[3456]]86-*-cygwin32*)
         HostArch_CPP='i386'
         HostVendor_CPP='unknown'
         HostOS_CPP='cygwin32'
+       exeext='.exe'
         ;;
 m68k-next-nextstep2)
         HostPlatform_CPP='m68k_next_nextstep2'
@@ -266,7 +278,9 @@ AC_SUBST(HostVendor_CPP)
 dnl AC_SUBST(BuildVendor_CPP)
 dnl AC_SUBST(TargetVendor_CPP)
 
-####--------------------------------------------------------------------
+AC_SUBST(exeext)
+
+# -------------------------------------------------------------------------
 dnl
 dnl * _GENERAL_ CONFIGURATION CHECKS
 #
@@ -388,11 +402,14 @@ AC_SUBST(CompressSuffix)
 dnl ** check for installed happy binary + version
 #
 AC_HAPPY
-if expr $HappyVersion \< "1.3" >/dev/null; then
+
+if test x"$HappyCmd" != x; then
+   if expr $HappyVersion \< "1.3" >/dev/null; then
        echo "   Happy Version 1.3 or later is required to compile GHC."
        echo "   Using the Happy sources in the tree.";
        HappyCmd=""
-fi;
+   fi
+fi
 
 #
 #