X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrftime.m4;h=527569415b368e0fed8465b06824978291aea94c;hb=99877a3a14f9489c65bb09b448b198696a8dede7;hp=6c12da6c2f79d15052bbf9abed8c06708371d84b;hpb=305ca0d0a10d03d10ab51535d1562b5d58cc1880;p=gnulib.git

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 6c12da6c2..527569415 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 9
 
 dnl This macro is intended to be used solely in this file.
 dnl These are the prerequisite macros for GNU's strftime.c replacement.
@@ -16,14 +16,10 @@ AC_DEFUN(_jm_STRFTIME_PREREQS,
  AC_CHECK_FUNCS(mblen mbrlen)
 
  AC_CHECK_MEMBER(struct tm.tm_gmtoff,
-                 [AC_DEFINE(HAVE_TM_GMTOFF)],
+                 [AC_DEFINE(HAVE_TM_GMTOFF, 1,
+                            [Define if struct tm has the tm_gmtoff member.])],
                  ,
-                 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>
-                 ])
+                 [#include <time.h>])
 ])
 
 dnl Determine if the strftime function has all the features of the GNU one.
@@ -40,8 +36,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
@@ -138,9 +133,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.