projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-02-08 10:20:50 by simonmar]
[ghc-hetmet.git]
/
aclocal.m4
diff --git
a/aclocal.m4
b/aclocal.m4
index
3a8aa2e
..
a746bc5
100644
(file)
--- a/
aclocal.m4
+++ b/
aclocal.m4
@@
-248,9
+248,15
@@
AC_DEFUN(FPTOOLS_HAPPY,
[
if test -d $srcdir/happy; then
SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
[
if test -d $srcdir/happy; then
SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
+else
+ SrcTreeHappyCmd=""
fi
if test x"$UseSrcTreeHappy" = xYES; then
fi
if test x"$UseSrcTreeHappy" = xYES; then
- HappyCmd=$SrcTreeHappyCmd
+ 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
else
AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
fi
@@
-267,8
+273,8
@@
fi;
changequote([, ])dnl
])
if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then
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.14],
- [AC_MSG_ERROR([Happy version 1.14 or later is required to compile GHC.])])[]dnl
+ 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)
fi
HappyVersion=$fptools_cv_happy_version;
AC_SUBST(HappyVersion)
@@
-282,9
+288,15
@@
AC_DEFUN(FPTOOLS_HADDOCK,
[
if test -d $srcdir/haddock; then
SrcTreeHaddockCmd=$hardtop/haddock/src/haddock-inplace
[
if test -d $srcdir/haddock; then
SrcTreeHaddockCmd=$hardtop/haddock/src/haddock-inplace
+else
+ SrcTreeHaddockCmd=""
fi
if test x"$UseSrcTreeHaddock" = xYES; then
fi
if test x"$UseSrcTreeHaddock" = xYES; then
- HaddockCmd=$SrcTreeHaddockCmd
+ 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
else
AC_PATH_PROG(HaddockCmd,haddock,$SrcTreeHaddockCmd)
fi
@@
-303,9
+315,15
@@
AC_DEFUN(FPTOOLS_ALEX,
[
if test -d $srcdir/alex; then
SrcTreeAlexCmd=$hardtop/alex/src/alex-inplace
[
if test -d $srcdir/alex; then
SrcTreeAlexCmd=$hardtop/alex/src/alex-inplace
+else
+ SrcTreeAlexCmd=""
fi
if test x"$UseSrcTreeAlex" = xYES; then
fi
if test x"$UseSrcTreeAlex" = xYES; then
- AlexCmd=$SrcTreeAlexCmd
+ 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
else
AC_PATH_PROG(AlexCmd,alex,$SrcTreeAlexCmd)
fi