X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=732eaccf31acdedad327b7b8439d51a2f9ef81ff;hb=f71611c47848e687376f7f18620bb148523bfbf3;hp=12972166663b38e612b159758376122498164acf;hpb=40e0e686d6d2c178509d6351a3095ecccd1233ed;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 129721666..732eaccf3 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,11 +1,12 @@
-#serial 8
+#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)
@@ -36,8 +37,7 @@ AC_DEFUN(jm_FUNC_GNU_STRFTIME,
  AC_CHECK_HEADERS(sys/time.h)
  AC_CACHE_CHECK([for working GNU strftime], jm_cv_func_working_gnu_strftime,
   [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<< /* Ulrich Drepper provided parts of the test program.  */
+[ /* Ulrich Drepper provided parts of the test program.  */
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
@@ -77,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");
@@ -134,9 +139,7 @@ main ()
   CMP ("%z", "+0000");		/* GNU */
 
   exit (n_fail ? 1 : 0);
-}
-	      >>,
-changequote([, ])dnl
+}],
 	     jm_cv_func_working_gnu_strftime=yes,
              jm_cv_func_working_gnu_strftime=no,
 	     dnl When crosscompiling, assume strftime is missing or broken.