X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=1f95d7e7759651722b232ff68eccf28a40d9d439;hb=25d8d8564059e0773aec16a7be1f434017950575;hp=91db2c36003182967ef982c245a55f024144fa79;hpb=c60e2ef8ab8f6f3484c42f5a757d2b296daedc12;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 91db2c360..1f95d7e77 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,6 +1,9 @@
-#serial 4
+#serial 6
 
-AC_DEFUN(jm_STRFTIME_PREREQS,
+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)
@@ -8,16 +11,14 @@ AC_DEFUN(jm_STRFTIME_PREREQS,
  dnl HAVE_TZNAME, HAVE_TZSET, HAVE_TM_ZONE, etc.
 ])
 
+dnl Determine if the strftime function has all the features of the GNU one.
+dnl
 dnl From Jim Meyering.
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl   /* Define to gnu_strftime if the replacement function should be used.  */
-dnl   #undef strftime
 dnl
 AC_DEFUN(jm_FUNC_GNU_STRFTIME,
 [AC_REQUIRE([AC_HEADER_TIME])dnl
 
- jm_STRFTIME_PREREQS
+ _jm_STRFTIME_PREREQS
 
  AC_REQUIRE([AC_C_CONST])dnl
  AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -79,6 +80,7 @@ main ()
   CMP ("%^B", "JANUARY");
   CMP ("%C", "19");		/* POSIX.2 */
   CMP ("%D", "01/09/70");	/* POSIX.2 */
+  CMP ("%F", "1970-01-09");
   CMP ("%G", "1970");		/* GNU */
   CMP ("%H", "13");
   CMP ("%I", "01");
@@ -102,7 +104,6 @@ main ()
   CMP ("%^c", "FRI JAN  9 13:06:07 1970");
   CMP ("%d", "09");
   CMP ("%e", " 9");		/* POSIX.2 */
-  CMP ("%f", "5");		/* POSIX.2 */
   CMP ("%g", "70");		/* GNU */
   CMP ("%h", "Jan");		/* POSIX.2 */
   CMP ("%^h", "JAN");
@@ -131,13 +132,15 @@ changequote([, ])dnl
 	     jm_cv_func_working_gnu_strftime=no)
   ])
   if test $jm_cv_func_working_gnu_strftime = no; then
-    LIBOBJS="$LIBOBJS strftime.o"
-    AC_DEFINE_UNQUOTED(strftime, gnu_strftime)
+    AC_SUBST(LIBOBJS)
+    LIBOBJS="$LIBOBJS strftime.$ac_objext"
+    AC_DEFINE_UNQUOTED(strftime, gnu_strftime,
+      [Define to gnu_strftime if the replacement function should be used.])
   fi
 ])
 
 AC_DEFUN(jm_FUNC_STRFTIME,
 [
-  jm_STRFTIME_PREREQS
+  _jm_STRFTIME_PREREQS
   AC_REPLACE_FUNCS(strftime)
 ])