X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=c9f0799f80a1ce85edcbd38cbfa54bf26d19a0a6;hb=b5f43414d0329b56abaaeb5e9e4708000e93670c;hp=9dafbfba342bf993c5f94558759bce0c09a51e79;hpb=8df809e4ce2319cccd91b14a74e13c879faaf357;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 9dafbfb..c9f0799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5.20060608], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 FP_SETUP_PROJECT_VERSION
 
@@ -721,7 +721,7 @@ fi;
 fi;
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
-if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then
+if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/compiler"; then
 AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
 fi;
 
@@ -909,51 +909,15 @@ FPTOOLS_GREENCARD(3.00)
 ]
 )
 
-AC_ARG_ENABLE(src-tree-happy,
-[AC_HELP_STRING([--enable-src-tree-happy],
-	[Build and use source tree (fptools/happy) version of Happy. 
-	 [default=autodetect]])],
-[ if test x"$enableval" = x"yes"; then
-	UseSrcTreeHappy=YES
-  else
-	UseSrcTreeHappy=NO
-  fi
-],
-[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
 FPTOOLS_HAPPY
 fi;
 
-AC_ARG_ENABLE(src-tree-haddock,
-[AC_HELP_STRING([--enable-src-tree-haddock],
-        [Build and use source tree (fptools/haddock) version of Haddock.
-	 [default=autodetect]])],
-[ if test x"$enableval" = x"yes"; then
-	UseSrcTreeHaddock=YES
-  else
-	UseSrcTreeHaddock=NO
-  fi
-],
-[UseSrcTreeHaddock=NO]
-)
 dnl ** check for installed haddock
 FPTOOLS_HADDOCK
 
-AC_ARG_ENABLE(src-tree-alex,
-[AC_HELP_STRING([--enable-src-tree-alex],
-        [Build and use source tree (fptools/alex) version of Alex.
-	 [default=autodetect]])],
-[ if test x"$enableval" = x"yes"; then
-	UseSrcTreeAlex=YES
-  else
-	UseSrcTreeAlex=NO
-  fi
-],
-[UseSrcTreeAlex=NO]
-)
 dnl ** check for installed alex binary + version
 dnl    (don't do it if we're booting from .hc files though.)
 if test "$BootingFromHc" = "NO"; then