[
if test -d $srcdir/happy; then
SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
+else
+ SrcTreeHappyCmd=""
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
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)
[
if test -d $srcdir/haddock; then
SrcTreeHaddockCmd=$hardtop/haddock/src/haddock-inplace
+else
+ SrcTreeHaddockCmd=""
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
[
if test -d $srcdir/alex; then
SrcTreeAlexCmd=$hardtop/alex/src/alex-inplace
+else
+ SrcTreeAlexCmd=""
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
AC_DEFUN([FP_PROG_AR_NEEDS_RANLIB],
[AC_REQUIRE([FP_PROG_AR_IS_GNU])
AC_REQUIRE([FP_PROG_AR_ARGS])
+AC_REQUIRE([AC_PROG_CC])
AC_CACHE_CHECK([whether ranlib is needed], [fp_cv_prog_ar_needs_ranlib],
[if test $fp_prog_ar_is_gnu = yes; then
fp_cv_prog_ar_needs_ranlib=no
+elif test $TargetPlatform = powerpc-apple-darwin; then
+ # It's quite tedious to check for Apple's crazy timestamps in .a files,
+ # so we hardcode it.
+ fp_cv_prog_ar_needs_ranlib=yes
elif echo $fp_prog_ar_args | grep "s" > /dev/null 2> /dev/null; then
fp_cv_prog_ar_needs_ranlib=no
else
# output variables HaveGcc and GccVersion.
AC_DEFUN([FP_HAVE_GCC],
[AC_REQUIRE([AC_PROG_CC])
-AC_CACHE_CHECK([whether your gcc is OK], [fp_cv_have_gcc],
-[if test -z "$GCC"; then
- fp_cv_have_gcc='no'
- AC_MSG_WARN([You would be better off with gcc, perhaps it is already installed, but not in your PATH?])
+if test -z "$GCC"; then
+ fp_have_gcc=NO
else
- fp_cv_have_gcc='yes'
- gcc_version_str="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\.\2/g' `"
- FP_COMPARE_VERSIONS([$gcc_version_str], [-lt], [2.0],
- [AC_MSG_ERROR([Need at least gcc version 2.0 (2.95.3 recommend)])])
-fi])
-AC_SUBST([HaveGcc], [`echo $fp_cv_have_gcc | sed 'y/yesno/YESNO/'`])
-AC_SUBST([GccVersion], [`gcc --version | grep mingw | cut -f 3 -d ' '`])
+ fp_have_gcc=YES
+fi
+if test "$fp_have_gcc" = "NO" -a -d $srcdir/ghc; then
+ AC_MSG_ERROR([gcc is required])
+fi
+AC_CACHE_CHECK([version of gcc], [fp_gcc_version],
+[if test "$fp_have_gcc" = "YES"; then
+ fp_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9]][[0-9]]*\(\.[[0-9]][[0-9]]*\)*\).*/\1/g' `"
+ FP_COMPARE_VERSIONS([$fp_gcc_version], [-lt], [2.0],
+ [AC_MSG_ERROR([Need at least gcc version 2.0 (3.4+ recommended)])])
+ else
+ fp_gcc_version="not-installed"
+ fi
+])
+AC_SUBST([HaveGcc], [$fp_have_gcc])
+AC_SUBST([GccVersion], [$fp_gcc_version])
])# FP_HAVE_GCC
AC_DEFUN([FP_MINGW_GCC],