--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,14 +1,29 @@
-#serial 6
+#serial 7
 
 dnl This macro is intended to be used solely in this file.
 dnl These are the prerequisite macros for GNU's strftime.c replacement.
-dnl FIXME: the list is far from complete
 AC_DEFUN(_jm_STRFTIME_PREREQS,
 [
  dnl strftime.c uses localtime_r if it exists.  Check for it.
  AC_CHECK_FUNCS(localtime_r)
- dnl FIXME: add tests for everything in strftime.c: e.g., HAVE_BCOPY,
- dnl HAVE_TZNAME, HAVE_TZSET, HAVE_TM_ZONE, etc.
+
+ AC_CHECK_HEADERS(limits.h)
+ AC_CHECK_FUNCS(bcopy tzset mempcpy memcpy memset)
+
+ # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
+ AC_STRUCT_TIMEZONE
+
+ AC_CHECK_FUNCS(mblen mbrlen)
+
+ AC_CHECK_MEMBER(struct tm.tm_gmtoff,
+                 [AC_DEFINE(HAVE_TM_GMTOFF)],
+                 ,
+                 dnl FIXME: having to put the closing square bracket on the
+                 dnl FIXME: next line is a gross kludge to work around an
+                 dnl FIXME: infelicity in how the new autoconf works.
+                 dnl FIXME: This should be fixed pretty soon.
+                 [#include <time.h>
+                 ])
 ])
 
 dnl Determine if the strftime function has all the features of the GNU one.