projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reflect renaming: s/UTILS_FUNC_DIRFD/gl_FUNC_DIRFD/.
[gnulib.git]
/
m4
/
strftime.m4
diff --git
a/m4/strftime.m4
b/m4/strftime.m4
index
1a0559e
..
0143a2e
100644
(file)
--- a/
m4/strftime.m4
+++ b/
m4/strftime.m4
@@
-1,45
+1,39
@@
-#serial
16
+#serial
22
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 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
,
+AC_DEFUN(
[_gl_STRFTIME_PREREQS]
,
[
[
- dnl strftime.c uses localtime_r and the underyling system strftime
- dnl if they exist.
- AC_CHECK_FUNCS(localtime_r strftime)
+ dnl strftime.c uses the underyling system strftime if it exists.
+ AC_FUNC_STRFTIME
- AC_CHECK_
HEADERS(limits.h
)
- AC_CHECK_FUNCS(
bcopy tzset mempcpy memcpy mem
set)
+ AC_CHECK_
FUNCS_ONCE(mempcpy
)
+ AC_CHECK_FUNCS(
tz
set)
# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
AC_STRUCT_TIMEZONE
AC_CHECK_FUNCS(mblen mbrlen)
# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
AC_STRUCT_TIMEZONE
AC_CHECK_FUNCS(mblen mbrlen)
+ AC_TYPE_MBSTATE_T
- 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_REQUIRE([gl_TM_GMTOFF])
+ AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
])
dnl From Jim Meyering.
dnl
])
dnl From Jim Meyering.
dnl
-AC_DEFUN(
jm_FUNC_GNU_STRFTIME
,
+AC_DEFUN(
[gl_FUNC_GNU_STRFTIME]
,
[AC_REQUIRE([AC_HEADER_TIME])dnl
[AC_REQUIRE([AC_HEADER_TIME])dnl
- _
jm
_STRFTIME_PREREQS
+ _
gl
_STRFTIME_PREREQS
AC_REQUIRE([AC_C_CONST])dnl
AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_CHECK_HEADERS(sys/time.h)
- AC_LIBOBJ(strftime)
+ AC_CHECK_HEADERS_ONCE(sys/time.h)
AC_DEFINE([my_strftime], [nstrftime],
[Define to the name of the strftime replacement function.])
])
AC_DEFINE([my_strftime], [nstrftime],
[Define to the name of the strftime replacement function.])
])
-AC_DEFUN(
jm_FUNC_STRFTIME
,
+AC_DEFUN(
[gl_FUNC_STRFTIME]
,
[
[
- _jm_STRFTIME_PREREQS
- AC_REPLACE_FUNCS(strftime)
+ _gl_STRFTIME_PREREQS
])
])