-dnl $Id: aclocal.m4,v 1.39 1999/03/01 17:39:54 simonm 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
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 |
[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`"