circular dependency hack

diff --git a/ChangeLog b/ChangeLog
index 7131f8be3cbdc57b0834ac9df2b9fe29f34d523d..3aadc4a7f31e61600744feff87cbdc58c765df57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Wed Nov 26 13:41:57 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * m4/ccstdc.m4: Don't force AM_PROG_CC_STDC before AC_PROG_CPP.
+       Temporary hack.
+
+       * m4/mktime.m4 (AM_FUNC_MTIME): New version from Paul Eggert.
+
        * header-vars.am (NORMAL_INSTALL, PRE_INSTALL, POST_INSTALL,
        NORMAL_UNINSTALL, PRE_UNINSTALL, POST_UNINSTALL): Define as `:',
        not `true'.

diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
index d8b6cd2dab857ccf8f14e4a64cb6ec606dc6b968..dfe01fb4053ff496657e7daf1c579fcb37cce1d8 100644 (file)
--- a/m4/ccstdc.m4
+++ b/m4/ccstdc.m4
@@ -27,7 +27,9 @@ AC_BEFORE([$0], [AC_C_CONST])
 dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
 dnl a magic option to avoid problems with ANSI preprocessor commands
 dnl like #elif.
-AC_BEFORE([$0], [AC_PROG_CPP])
+dnl FIXME: can't do this because then AC_AIX won't work due to a
+dnl circular dependency.
+dnl AC_BEFORE([$0], [AC_PROG_CPP])
 AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
 AC_CACHE_VAL(am_cv_prog_cc_stdc,
 [am_cv_prog_cc_stdc=no

diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 4be030aa141e4763b83ac34739e75668d8f9e1b1..8f9a8d92a111f4c5ce7fc2a6bb3bf199d849a567 100644 (file)
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,11 +1,12 @@
-#serial 2
+#serial 3
 
 dnl From Jim Meyering.
 dnl FIXME: this should migrate into libit.
 
 AC_DEFUN(AM_FUNC_MKTIME,
 [AC_REQUIRE([AC_HEADER_TIME])dnl
- AC_CHECK_HEADERS(sys/time.h)
+ AC_CHECK_HEADERS(sys/time.h unistd.h)
+ AC_CHECK_FUNCS(alarm)
  AC_CACHE_CHECK([for working mktime], am_cv_func_working_mktime,
   [AC_TRY_RUN(
 changequote(<<, >>)dnl
@@ -26,7 +27,8 @@ static time_t time_t_max;
 
 /* Values we'll use to set the TZ environment variable.  */
 static const char *const tz_strings[] = {
-  NULL, "GMT0", "JST-9", "EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
+  (const char *) 0, "GMT0", "JST-9",
+  "EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
 
@@ -34,18 +36,49 @@ static void
 mktime_test (now)
      time_t now;
 {
-  if (mktime (localtime (&now)) != now)
+  struct tm *lt;
+  if ((lt = localtime (&now)) && mktime (lt) != now)
     exit (1);
   now = time_t_max - now;
-  if (mktime (localtime (&now)) != now)
+  if ((lt = localtime (&now)) && mktime (lt) != now)
     exit (1);
 }
 
+static void
+bigtime_test (j)
+     int j;
+{
+  struct tm tm;
+  time_t now;
+  tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j;
+  /* This test makes some buggy mktime implementations loop.
+     Give up after 10 seconds.  */
+  alarm (10);
+  now = mktime (&tm);
+  alarm (0);
+  if (now != (time_t) -1)
+    {
+      struct tm *lt = localtime (&now);
+      if (! (lt
+            && lt->tm_year == tm.tm_year
+            && lt->tm_mon == tm.tm_mon
+            && lt->tm_mday == tm.tm_mday
+            && lt->tm_hour == tm.tm_hour
+            && lt->tm_min == tm.tm_min
+            && lt->tm_sec == tm.tm_sec
+            && lt->tm_yday == tm.tm_yday
+            && lt->tm_wday == tm.tm_wday
+            && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
+                 == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
+       exit (1);
+    }
+}
+
 int
 main ()
 {
   time_t t, delta;
-  int i;
+  int i, j;
 
   for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
     continue;
@@ -60,6 +93,10 @@ main ()
        mktime_test (t);
       mktime_test ((time_t) 60 * 60);
       mktime_test ((time_t) 60 * 60 * 24);
+
+      for (j = 1; 0 < j; j *= 2)
+        bigtime_test (j);
+      bigtime_test (j - 1);
     }
   exit (0);
 }