gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / strftime.m4

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 0143a2e..b31f495 100644 (file)
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,39 +1,28 @@
-#serial 22
+# serial 33
 
-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([_gl_STRFTIME_PREREQS],
-[
- dnl strftime.c uses the underyling system strftime if it exists.
- AC_FUNC_STRFTIME
+# Copyright (C) 1996-1997, 1999-2007, 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
- AC_CHECK_FUNCS_ONCE(mempcpy)
- AC_CHECK_FUNCS(tzset)
+# Written by Jim Meyering and Paul Eggert.
 
- # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
- AC_STRUCT_TIMEZONE
+AC_DEFUN([gl_FUNC_GNU_STRFTIME],
+[
+  gl_FUNC_STRFTIME
+])
 
- AC_CHECK_FUNCS(mblen mbrlen)
- AC_TYPE_MBSTATE_T
+# These are the prerequisite macros for GNU's strftime.c replacement.
+AC_DEFUN([gl_FUNC_STRFTIME],
+[
+ # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
+ AC_REQUIRE([AC_STRUCT_TIMEZONE])
 
  AC_REQUIRE([gl_TM_GMTOFF])
- AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
-])
-
-dnl From Jim Meyering.
-dnl
-AC_DEFUN([gl_FUNC_GNU_STRFTIME],
-[AC_REQUIRE([AC_HEADER_TIME])dnl
 
- _gl_STRFTIME_PREREQS
+ AC_CHECK_FUNCS_ONCE([tzset])
 
- AC_REQUIRE([AC_C_CONST])dnl
- AC_CHECK_HEADERS_ONCE(sys/time.h)
  AC_DEFINE([my_strftime], [nstrftime],
    [Define to the name of the strftime replacement function.])
 ])
-
-AC_DEFUN([gl_FUNC_STRFTIME],
-[
-  _gl_STRFTIME_PREREQS
-])