From c21d7cede2478d147340cd1ebdb26875d3ba333b Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 23 Jun 2006 11:33:03 +0000 Subject: [PATCH] --enable-src-tree-haddock and friends are no longer required Happy, Alex and Haddock are built separately using Cabal now. --- aclocal.m4 | 63 +++++++--------------------------------------------------- configure.ac | 38 +---------------------------------- 2 files changed, 8 insertions(+), 93 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ebe182d..f8202bf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -245,26 +245,10 @@ dnl at least Happy version 1.14. If there's no installed Happy, we look dnl for a happy source tree and point the build system at that instead. dnl AC_DEFUN([FPTOOLS_HAPPY], -[ -if test -d $srcdir/happy; then - SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace -else - SrcTreeHappyCmd="" -fi -if test x"$UseSrcTreeHappy" = xYES; then - if test x"$SrcTreeHappyCmd" != x; then - HappyCmd=$SrcTreeHappyCmd - else - AC_MSG_ERROR([--enable-src-tree-happy given, but happy not found in source tree]) - fi -else - AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd) -fi +[AC_PATH_PROG(HappyCmd,happy,) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl -[if test x"$HappyCmd" = x"$SrcTreeHappyCmd" -a -e $srcdir/happy/mk/version.mk; then - fptools_cv_happy_version=`grep '^ProjectVersion[ ]*=' $srcdir/happy/mk/version.mk | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; -elif test x"$HappyCmd" != x; then +[if test x"$HappyCmd" != x; then fptools_cv_happy_version="`$HappyCmd -v | grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ; else @@ -272,10 +256,8 @@ else fi; changequote([, ])dnl ]) -if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15], +FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15], [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]dnl -fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) ]) @@ -285,21 +267,7 @@ dnl Check for Haddock and version. If there's no installed Haddock, we look dnl for a haddock source tree and point the build system at that instead. dnl AC_DEFUN([FPTOOLS_HADDOCK], -[ -if test -d $srcdir/haddock; then - SrcTreeHaddockCmd=$hardtop/haddock/src/haddock-inplace -else - SrcTreeHaddockCmd="" -fi -if test x"$UseSrcTreeHaddock" = xYES; then - if test x"$SrcTreeHaddockCmd" != x; then - HaddockCmd=$SrcTreeHaddockCmd - else - AC_MSG_ERROR([--enable-src-tree-haddock given, but haddock not found in source tree]) - fi -else - AC_PATH_PROG(HaddockCmd,haddock,$SrcTreeHaddockCmd) -fi +[AC_PATH_PROG(HaddockCmd,haddock,) dnl Darn, I forgot to make Haddock print out its version number when dnl invoked with -v. We could try generating some HTML and grepping dnl through that to find the version number, but I think we'll make @@ -313,25 +281,10 @@ dnl for a alex source tree and point the build system at that instead. dnl AC_DEFUN([FPTOOLS_ALEX], [ -if test -d $srcdir/alex; then - SrcTreeAlexCmd=$hardtop/alex/src/alex-inplace -else - SrcTreeAlexCmd="" -fi -if test x"$UseSrcTreeAlex" = xYES; then - if test x"$SrcTreeAlexCmd" != x; then - AlexCmd=$SrcTreeAlexCmd - else - AC_MSG_ERROR([--enable-src-tree-alex given, but alex not found in source tree]) - fi -else - AC_PATH_PROG(AlexCmd,alex,$SrcTreeAlexCmd) -fi +AC_PATH_PROG(AlexCmd,alex,) AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version, changequote(, )dnl -[if test x"$AlexCmd" = x"$SrcTreeAlexCmd"; then - fptools_cv_alex_version=`grep '^ProjectVersion[ ]*=' $srcdir/alex/mk/version.mk | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`; -elif test x"$AlexCmd" != x; then +[if test x"$AlexCmd" != x; then fptools_cv_alex_version="`$AlexCmd -v | grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'`" ; else @@ -339,10 +292,8 @@ else fi; changequote([, ])dnl ]) -if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Lexer.hs; then - FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0], +FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0], [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])[]dnl -fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ]) diff --git a/configure.ac b/configure.ac index 4959743..c9f0799 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -- 1.7.10.4