X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=078d1801cf9d8c64854457ae870fba6280c09cc6;hb=8c85fb2b78f749d000eadb358c2cccee2e052f33;hp=034f7fb559f252d96230f63fd04ec1a38d2f597e;hpb=1c8be26abfdf428973bce2a7fab740020accc286;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 034f7fb..078d180 100644
--- a/configure.in
+++ b/configure.in
@@ -28,10 +28,11 @@ if test x"$srcdir" != 'x.' ; then
 fi
 
 #
-# Remove some automounter nonsense (Glasgow specific gruff)
+# Remove common automounter nonsense + convert from UNC to DOS style paths
+# (cygwin32-beta18 for UNC isn't quite there yet.)
 #
 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|' | sed 's|^//\(.\)/|\1:/|' `
 
 echo ''
 echo "*** The top of your build tree is: $hardtop"
@@ -66,13 +67,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 +84,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 +155,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 +279,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 +403,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
 
 #
 #