[project @ 1999-08-02 13:11:02 by simonmar]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 42aee42..a5716cb 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.38 1999/02/08 11:16:17 sof Exp $
+dnl $Id: aclocal.m4,v 1.44 1999/08/02 13:11:02 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -137,7 +137,7 @@ dnl
 dnl Check for Happy and version.
 dnl
 AC_DEFUN(FPTOOLS_HAPPY,
-[AC_PATH_PROG(HappyCmd,happy)
+[AC_PATH_PROG(HappyCmd,happy,,$PATH ${hardtop}/happy/src)
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 [if test x"$HappyCmd" != x; then
    fptools_cv_happy_version="`$HappyCmd -v |
@@ -147,10 +147,12 @@ changequote([, ])dnl
 else
    fptools_cv_happy_version="";
 fi;
-if expr "$fptools_cv_happy_version" "<" 1.4 > /dev/null 2>&1; then
-   echo
-   echo "Happy version 1.4 or later is required to compile GHC."
-   exit 1;
+if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then
+   if test -d ghc; then
+     echo
+     echo "Happy version 1.6 or later is required to compile GHC."
+     exit 1;
+   fi
 fi;
 ])
 HappyVersion=$ac_cv_happy_version;
@@ -303,36 +305,6 @@ HaveGcc=`echo $fptools_cv_have_gcc | sed 'y/yesno/YESNO/'`
 AC_SUBST(HaveGcc)
 ])
 
-dnl
-dnl FPTOOLS_PROG_GNUCPP gathers the path to the cpp that the
-dnl gcc driver calls upon.
-dnl
-dnl Substitutes: GNUCPP and RAWCPP (latter is 'GNUCPP -traditional')
-dnl
-AC_DEFUN(FPTOOLS_PROG_GNUCPP,
-[AC_CACHE_CHECK([how to invoke GNU cpp directly], fptools_cv_gnu_cpp,
-[if test "$HaveGcc" = "YES"; then
-       echo > conftest.c
-       gcc -v -E conftest.c >/dev/null 2>conftest.out
-       # \x5c = backslash
-       echo 'tr/\x5c/\//; /(\S+\/)cpp/ && print "[$]{1}cpp -iprefix [$]1";' > conftest.pl
-       fptools_cv_gnu_cpp="`eval $PerlCmd -n conftest.pl conftest.out`"
-       rm -fr conftest*
- else
-       # We need to be able to invoke CPP directly, preferably
-       # with input from stdin (mkdependHS and hscpp depend on
-       # this at the moment).
-       # Take a guess at what to use, this probably won't work.
-       echo Warning: GNU cpp not found, using $CPP
-       fptools_cv_gnu_cpp = $CPP
- fi
-])
-GNUCPP=$fptools_cv_gnu_cpp
-RAWCPP="$GNUCPP -traditional"
-AC_SUBST(GNUCPP)
-AC_SUBST(RAWCPP)
-])
-
 dnl Small feature test for perl version. Assumes PerlCmd
 dnl contains path to perl binary
 dnl
@@ -482,7 +454,7 @@ dnl
 AC_DEFUN(FPTOOLS_END_TEXT_SECTION,
 [AC_MSG_CHECKING([for end of text section marker])
 not_done=1
-for i in etext _etext __etext; do
+for i in data_start _data_start etext _etext __etext; do
   FPTOOLS_IN_SCOPE($i,$i,fptools_end_of_text)
   if test "$fptools_end_of_text" = yes; then
    AC_CACHE_VAL([fptools_cv_end_of_text_decl], AC_DEFINE_UNQUOTED(TEXT_SECTION_END_MARKER_DECL, $i))