[project @ 1999-06-28 10:04:18 by simonmar]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 1e01c26..c79cef4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.36 1999/01/11 10:15:04 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
@@ -7,6 +7,28 @@ dnl prefixed with FPTOOLS_ to ensure we don't clash
 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 
@@ -23,7 +45,7 @@ AC_DEFUN(FPTOOLS_TYPE_TIMEZONE,
 # 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)
@@ -77,7 +99,8 @@ changequote(<<, >>)dnl
 <<
 case $HostPlatform in
 alpha-dec-osf*) fptools_cv_lead_uscore='no';;
-*cygwin32)      fptools_cv_lead_uscore='yes';;
+*cygwin32) fptools_cv_lead_uscore='yes';;
+*mingw32) fptools_cv_lead_uscore='yes';;
 *) >>
 changequote([, ])dnl
 AC_TRY_RUN([#ifdef HAVE_NLIST_H
@@ -114,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 |
@@ -290,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`"
@@ -459,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))