-dnl $Id: aclocal.m4,v 1.37 1999/01/26 09:59:18 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
dnl with any pre-supplied autoconf ones.
dnl
+dnl Is timezone around? (in a header file)
+dnl
+AC_DEFUN(FPTOOLS_HAVE_TIMEZONE,
+[AC_CACHE_CHECK([timezone], fptools_cv_have_timezone,
+[AC_TRY_COMPILE([#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+], [return timezone;],
+fptools_cv_have_timezone=yes, fptools_cv_have_timezone=no)])
+if test "$fptools_cv_have_timezone" = yes; then
+ AC_DEFINE(HAVE_TIMEZONE)
+fi
+])
+
+dnl
dnl Has timezone the type time_t or long (HP-UX 10.20 apparently
dnl has `long'..)
dnl
# endif
#endif
-extern time_t timezone;
+extern time_t timezone;
],
[int i;], fptools_cv_type_timezone=time_t, fptools_cv_type_timezone=long)])
AC_DEFINE_UNQUOTED(TYPE_TIMEZONE, $fptools_cv_type_timezone)
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 |
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;
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
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))