[project @ 1999-02-08 11:16:17 by sof]

Added `timezone' config test.

diff --git a/acconfig.h b/acconfig.h
index 294da5c..48027d6 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -54,6 +54,9 @@
 /* Define if compiler supports prototypes. */
 #define HAVE_PROTOTYPES 0
 
+/* Define if time.h or sys/time.h define the timezone variable */
+#undef HAVE_TIMEZONE
+
 /* Define if you have the WinExec function.  */
 #define HAVE_WINEXEC 0
 

diff --git a/aclocal.m4 b/aclocal.m4
index b442a35..42aee42 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.37 1999/01/26 09:59:18 sof Exp $
+dnl $Id: aclocal.m4,v 1.38 1999/02/08 11:16:17 sof 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)

diff --git a/configure.in b/configure.in
index 9124666..6e174af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -470,6 +470,7 @@ dnl ** how do we get a timezone name, and UTC offset ?
 AC_STRUCT_TIMEZONE
 
 dnl ** what's the type of timezone?
+FPTOOLS_HAVE_TIMEZONE
 FPTOOLS_TYPE_TIMEZONE
 
 dnl ** do we have altzone?

diff --git a/ghc/lib/std/cbits/timezone.h b/ghc/lib/std/cbits/timezone.h
index 5050342..65f69e3 100644 (file)
--- a/ghc/lib/std/cbits/timezone.h
+++ b/ghc/lib/std/cbits/timezone.h
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: timezone.h,v 1.4 1999/02/05 14:34:05 sof Exp $
+ * $Id: timezone.h,v 1.5 1999/02/08 11:16:20 sof Exp $
  *
  * Time-zone support header
  */
@@ -57,7 +57,7 @@ extern char *tzname[2];
 # endif /* ! HAVE_TZNAME */
 /* Get the offset in secs from UTC, if (struct tm) doesn't supply it. */
 
-#ifndef cygwin32_TARGET_OS
+#ifndef HAVE_TIMEZONE
 extern TYPE_TIMEZONE timezone;
 #endif
 

diff --git a/mk/config.h.in b/mk/config.h.in
index 580029c..780f491 100644 (file)
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -105,6 +105,9 @@
 /* Define if compiler supports prototypes. */
 #define HAVE_PROTOTYPES 0
 
+/* Define if time.h or sys/time.h define the timezone variable */
+#undef HAVE_TIMEZONE
+
 /* Define if you have the WinExec function.  */
 #define HAVE_WINEXEC 0