[project @ 2002-01-02 12:32:18 by simonmar]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index d7f637d..0f124a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -266,15 +266,15 @@ powerpc-ibm-aix*)
         HostVendor_CPP='ibm'
         HostOS_CPP='aix'
         ;;
-powerpc-apple-macosx*)
-      HostPlatform=powerpc-apple-macosx
-      TargetPlatform=powerpc-apple-macosx #hack
-      BuildPlatform=powerpc-apple-macosx #hack
-        HostPlatform_CPP='powerpc_apple_macosx'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='apple'
-        HostOS_CPP='macosx'
-        ;;
+powerpc-apple-darwin*)
+       HostPlatform=powerpc-apple-darwin
+       TargetPlatform=powerpc-apple-darwin #hack
+       BuildPlatform=powerpc-apple-darwin #hack
+       HostPlatform_CPP='powerpc_apple_darwin'
+       HostArch_CPP='powerpc'
+       HostVendor_CPP='apple'
+       HostOS_CPP='darwin'
+       ;;
 sparc-sun-sunos4*)
        HostPlatform=sparc-sun-sunos4
        TargetPlatform=sparc-sun-sunos4 #hack
@@ -342,7 +342,7 @@ AC_SUBST(exeext)
 case $HostPlatform in
   i386-unknown-mingw32 | i386-unknown-cygwin32)
        # get rid off /cygdrive/ prefix
-       hardtop=`echo ${hardtop} | sed -e 's%/cygdrive/\(.\)/%\1:/%g' `
+       hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' `
        hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' `
        ;;
   *)
@@ -629,6 +629,13 @@ fi
 AC_SUBST(CompressCmd)
 AC_SUBST(CompressSuffix)
 
+AC_ARG_ENABLE(src-tree-happy,
+[  --enable-src-tree-happy
+        Build and use source tree (fptools/happy) version of happy.
+],
+[UseSrcTreeHappy=YES],
+[UseSrcTreeHappy=NO]
+)
 dnl ** check for installed happy binary + version
 dnl    (don't do it if we're booting from .hc files though.)
 if test "$BootingFromHc" = "NO"; then