[project @ 1999-07-12 10:43:10 by sof]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 42aee42..c79cef4 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.42 1999/06/07 10:12:52 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 |
@@ -313,7 +313,7 @@ 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
+       $CC -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`"
@@ -482,7 +482,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))