X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=732eaccf31acdedad327b7b8439d51a2f9ef81ff;hb=05d4ef79c00e77a54f781355c1cf4242a4e54c4b;hp=527569415b368e0fed8465b06824978291aea94c;hpb=227f0e7e30fe7259da90cc4b96437f5476000564;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 527569415..732eaccf3 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,11 +1,12 @@
-#serial 9
+#serial 13
 
 dnl This macro is intended to be used solely in this file.
 dnl These are the prerequisite macros for GNU's strftime.c replacement.
 AC_DEFUN(_jm_STRFTIME_PREREQS,
 [
- dnl strftime.c uses localtime_r if it exists.  Check for it.
- AC_CHECK_FUNCS(localtime_r)
+ dnl strftime.c uses localtime_r and the underyling system strftime
+ dnl if they exist.
+ AC_CHECK_FUNCS(localtime_r strftime)
 
  AC_CHECK_HEADERS(limits.h)
  AC_CHECK_FUNCS(bcopy tzset mempcpy memcpy memset)
@@ -76,6 +77,11 @@ main ()
   time_t t = 738367; /* Fri Jan  9 13:06:07 1970 */
   tm = gmtime (&t);
 
+  /* Undefine this in case the configure-time putenv test has defined it
+     to something else.  The use we make of this function here doesn't
+     require the added functionality of the replacement one.  */
+#undef putenv
+
   /* This is necessary to make strftime give consistent zone strings and
      e.g., seconds since the epoch (%s).  */
   putenv ("TZ=GMT0");