summaryrefslogtreecommitdiff
path: root/m4/strftime.m4
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-04-05 11:50:48 +0000
committerJim Meyering <jim@meyering.net>2000-04-05 11:50:48 +0000
commit48c6dffe80e6e2dc4fbf0850ff63c311058c0070 (patch)
tree466df8de89e432b33e3286edc2b6eb204195b955 /m4/strftime.m4
parentcc7186a919bb5fa3268bd82a6278121b1e6ae170 (diff)
downloadcoreutils-48c6dffe80e6e2dc4fbf0850ff63c311058c0070.tar.xz
Back out the 2000-04-02 change.
Diffstat (limited to 'm4/strftime.m4')
-rw-r--r--m4/strftime.m414
1 files changed, 6 insertions, 8 deletions
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 22790f6a3..ad12ddb11 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,4 +1,4 @@
-#serial 11
+#serial 12
dnl This macro is intended to be used solely in this file.
dnl These are the prerequisite macros for GNU's strftime.c replacement.
@@ -36,11 +36,7 @@ AC_DEFUN(jm_FUNC_GNU_STRFTIME,
AC_REQUIRE([AC_HEADER_STDC])dnl
AC_CHECK_HEADERS(sys/time.h)
AC_CACHE_CHECK([for working GNU strftime], jm_cv_func_working_gnu_strftime,
- [# Set TZ to GMT0 to make strftime give consistent results during the test.
- ac_save_TZ="${TZ-GMT0}"
- TZ=GMT0
- export TZ
- AC_TRY_RUN(
+ [AC_TRY_RUN(
[ /* Ulrich Drepper provided parts of the test program. */
#if STDC_HEADERS
# include <stdlib.h>
@@ -81,6 +77,10 @@ main ()
time_t t = 738367; /* Fri Jan 9 13:06:07 1970 */
tm = gmtime (&t);
+ /* This is necessary to make strftime give consistent zone strings and
+ e.g., seconds since the epoch (%s). */
+ putenv ("TZ=GMT0");
+
#undef CMP
#define CMP(Fmt, Expected) n_fail += compare ((Fmt), tm, (Expected))
@@ -139,8 +139,6 @@ main ()
jm_cv_func_working_gnu_strftime=no,
dnl When crosscompiling, assume strftime is missing or broken.
jm_cv_func_working_gnu_strftime=no)
- dnl If TZ wasn't set before, this sets it to GMT0. No real harm done.
- TZ="$ac_save_TZ"
])
if test $jm_cv_func_working_gnu_strftime = no; then
AC_SUBST(LIBOBJS)