mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-25 10:47:00 +00:00
68a256c892
Make the following changes by hand, and run 'admin/merge-gnulib'. * .gitignore: Add lib/malloc/*.gl.h. * admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h directly from Gnulib, without worrying about Gnulib modules, as these files are special cases. (AVOIDED_MODULES): Remove malloc-posix. * lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4: * m4/year2038.m4: New files, copied from Gnulib. * lib/malloca.c, lib/malloca.h: * m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4: Remove. These are either no longer present in Gnulib, or are no longer needed by modules that Emacs uses. * oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first; needed for new Gnulib. * src/xmenu.c: Call emacs_abort, not abort.
176 lines
7.0 KiB
Plaintext
176 lines
7.0 KiB
Plaintext
# Configure a more-standard replacement for <time.h>.
|
|
|
|
# Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc.
|
|
|
|
# serial 18
|
|
|
|
# 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 Paul Eggert and Jim Meyering.
|
|
|
|
AC_DEFUN_ONCE([gl_TIME_H],
|
|
[
|
|
dnl Ensure to expand the default settings once only, before all statements
|
|
dnl that occur in other macros.
|
|
AC_REQUIRE([gl_TIME_H_DEFAULTS])
|
|
|
|
gl_NEXT_HEADERS([time.h])
|
|
AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
|
|
|
|
AC_REQUIRE([AC_C_RESTRICT])
|
|
|
|
AC_CACHE_CHECK([for TIME_UTC in <time.h>],
|
|
[gl_cv_time_h_has_TIME_UTC],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <time.h>
|
|
]],
|
|
[[static int x = TIME_UTC; x++;]])],
|
|
[gl_cv_time_h_has_TIME_UTC=yes],
|
|
[gl_cv_time_h_has_TIME_UTC=no])])
|
|
if test $gl_cv_time_h_has_TIME_UTC = yes; then
|
|
TIME_H_DEFINES_TIME_UTC=1
|
|
else
|
|
TIME_H_DEFINES_TIME_UTC=0
|
|
fi
|
|
AC_SUBST([TIME_H_DEFINES_TIME_UTC])
|
|
])
|
|
|
|
dnl Check whether 'struct timespec' is declared
|
|
dnl in time.h, sys/time.h, pthread.h, or unistd.h.
|
|
|
|
AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
|
|
[
|
|
AC_CHECK_HEADERS_ONCE([sys/time.h])
|
|
AC_CACHE_CHECK([for struct timespec in <time.h>],
|
|
[gl_cv_sys_struct_timespec_in_time_h],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <time.h>
|
|
]],
|
|
[[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
|
|
[gl_cv_sys_struct_timespec_in_time_h=yes],
|
|
[gl_cv_sys_struct_timespec_in_time_h=no])])
|
|
|
|
TIME_H_DEFINES_STRUCT_TIMESPEC=0
|
|
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
|
|
PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
|
|
UNISTD_H_DEFINES_STRUCT_TIMESPEC=0
|
|
if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
|
|
TIME_H_DEFINES_STRUCT_TIMESPEC=1
|
|
else
|
|
AC_CACHE_CHECK([for struct timespec in <sys/time.h>],
|
|
[gl_cv_sys_struct_timespec_in_sys_time_h],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <sys/time.h>
|
|
]],
|
|
[[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
|
|
[gl_cv_sys_struct_timespec_in_sys_time_h=yes],
|
|
[gl_cv_sys_struct_timespec_in_sys_time_h=no])])
|
|
if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
|
|
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
|
|
else
|
|
AC_CACHE_CHECK([for struct timespec in <pthread.h>],
|
|
[gl_cv_sys_struct_timespec_in_pthread_h],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <pthread.h>
|
|
]],
|
|
[[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
|
|
[gl_cv_sys_struct_timespec_in_pthread_h=yes],
|
|
[gl_cv_sys_struct_timespec_in_pthread_h=no])])
|
|
if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
|
|
PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
|
|
else
|
|
AC_CACHE_CHECK([for struct timespec in <unistd.h>],
|
|
[gl_cv_sys_struct_timespec_in_unistd_h],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <unistd.h>
|
|
]],
|
|
[[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
|
|
[gl_cv_sys_struct_timespec_in_unistd_h=yes],
|
|
[gl_cv_sys_struct_timespec_in_unistd_h=no])])
|
|
if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
|
|
UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
|
|
AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
|
|
AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
|
|
AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC])
|
|
])
|
|
|
|
# gl_TIME_MODULE_INDICATOR([modulename])
|
|
# sets the shell variable that indicates the presence of the given module
|
|
# to a C preprocessor expression that will evaluate to 1.
|
|
# This macro invocation must not occur in macros that are AC_REQUIREd.
|
|
AC_DEFUN([gl_TIME_MODULE_INDICATOR],
|
|
[
|
|
dnl Ensure to expand the default settings once only.
|
|
gl_TIME_H_REQUIRE_DEFAULTS
|
|
gl_MODULE_INDICATOR_SET_VARIABLE([$1])
|
|
dnl Define it also as a C macro, for the benefit of the unit tests.
|
|
gl_MODULE_INDICATOR_FOR_TESTS([$1])
|
|
])
|
|
|
|
# Initializes the default values for AC_SUBSTed shell variables.
|
|
# This macro must not be AC_REQUIREd. It must only be invoked, and only
|
|
# outside of macros or in macros that are not AC_REQUIREd.
|
|
AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS],
|
|
[
|
|
m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET])
|
|
dnl Support Microsoft deprecated alias function names by default.
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1])
|
|
])
|
|
m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS])
|
|
AC_REQUIRE([gl_TIME_H_DEFAULTS])
|
|
])
|
|
|
|
AC_DEFUN([gl_TIME_H_DEFAULTS],
|
|
[
|
|
dnl Assume proper GNU behavior unless another module says otherwise.
|
|
HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R])
|
|
HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP])
|
|
HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME])
|
|
HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM])
|
|
HAVE_TIMESPEC_GET=1; AC_SUBST([HAVE_TIMESPEC_GET])
|
|
dnl Even GNU libc does not have timezone_t yet.
|
|
HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T])
|
|
dnl If another module says to replace or to not replace, do that.
|
|
dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
|
|
dnl this lets maintainers check for portability.
|
|
REPLACE_CTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_CTIME])
|
|
REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; AC_SUBST([REPLACE_LOCALTIME_R])
|
|
REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME])
|
|
REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP])
|
|
REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME])
|
|
REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM])
|
|
REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET])
|
|
|
|
dnl Hack so that the time module doesn't depend on the sys_time module.
|
|
dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
|
|
: ${GNULIB_GETTIMEOFDAY=0}; AC_SUBST([GNULIB_GETTIMEOFDAY])
|
|
dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
|
|
dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
|
|
dnl is no longer a big deal.
|
|
REPLACE_GMTIME=0; AC_SUBST([REPLACE_GMTIME])
|
|
REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME])
|
|
])
|