mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-25 07:28:20 +00:00
39c2fa3f4e
This attempts to repair problems introduced by the bad merge
5491fd1098. The easiest way for me
to fix the badly-merged gnulib files was to run
'admin/merge-gnulib', so I did that, which also imported the
following changes:
* build-aux/update-copyright, m4/gnulib.m4:
Update from gnulib, incorporating:
2015-01-15 time: port to MinGW32 3.21
2015-01-15 update-copyright: apply to self
2015-01-11 update-copyright: recognize groff's \(co marker
29 lines
741 B
Plaintext
29 lines
741 B
Plaintext
# serial 33
|
|
|
|
# Copyright (C) 1996-1997, 1999-2007, 2009-2015 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.
|
|
|
|
# Written by Jim Meyering and Paul Eggert.
|
|
|
|
AC_DEFUN([gl_FUNC_GNU_STRFTIME],
|
|
[
|
|
gl_FUNC_STRFTIME
|
|
])
|
|
|
|
# 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_CHECK_FUNCS_ONCE([tzset])
|
|
|
|
AC_DEFINE([my_strftime], [nstrftime],
|
|
[Define to the name of the strftime replacement function.])
|
|
])
|