gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / strftime.m4

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 684a6a2..b31f495 100644 (file)
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,42 +1,28 @@
-#serial 18
+# 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([_jm_STRFTIME_PREREQS],
-[
- dnl strftime.c uses the underyling system strftime if it exists.
- AC_CHECK_FUNCS(strftime)
-
- 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
+# 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(mblen mbrlen)
+# Written by Jim Meyering and Paul Eggert.
 
- AC_CHECK_MEMBER([struct tm.tm_gmtoff],
-                 [AC_DEFINE(HAVE_TM_GMTOFF, 1,
-                            [Define if struct tm has the tm_gmtoff member.])],
-                 ,
-                 [#include <time.h>])
+AC_DEFUN([gl_FUNC_GNU_STRFTIME],
+[
+  gl_FUNC_STRFTIME
 ])
 
-dnl From Jim Meyering.
-dnl
-AC_DEFUN([jm_FUNC_GNU_STRFTIME],
-[AC_REQUIRE([AC_HEADER_TIME])dnl
+# 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])
 
- _jm_STRFTIME_PREREQS
+ AC_CHECK_FUNCS_ONCE([tzset])
 
- AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_CHECK_HEADERS(sys/time.h)
  AC_DEFINE([my_strftime], [nstrftime],
    [Define to the name of the strftime replacement function.])
 ])
-
-AC_DEFUN([jm_FUNC_STRFTIME],
-[
-  _jm_STRFTIME_PREREQS
-])