mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-22 07:09:54 +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.
69 lines
2.4 KiB
Plaintext
69 lines
2.4 KiB
Plaintext
# sys_random_h.m4 serial 8
|
|
dnl Copyright (C) 2020-2021 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
AC_DEFUN_ONCE([gl_SYS_RANDOM_H],
|
|
[
|
|
AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS])
|
|
dnl <sys/random.h> is always overridden, because of GNULIB_POSIXCHECK.
|
|
gl_CHECK_NEXT_HEADERS([sys/random.h])
|
|
if test $ac_cv_header_sys_random_h = yes; then
|
|
HAVE_SYS_RANDOM_H=1
|
|
else
|
|
HAVE_SYS_RANDOM_H=0
|
|
fi
|
|
AC_SUBST([HAVE_SYS_RANDOM_H])
|
|
|
|
m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
|
|
if test $ac_cv_header_sys_random_h = yes; then
|
|
UNISTD_H_HAVE_SYS_RANDOM_H=1
|
|
fi
|
|
|
|
dnl Check for declarations of anything we want to poison if the
|
|
dnl corresponding gnulib module is not in use.
|
|
gl_WARN_ON_USE_PREPARE([[
|
|
#if HAVE_SYS_RANDOM_H
|
|
/* Additional includes are needed before <sys/random.h> on uClibc
|
|
and Mac OS X. */
|
|
# include <sys/types.h>
|
|
# include <stdlib.h>
|
|
# include <sys/random.h>
|
|
#endif
|
|
]],
|
|
[getrandom])
|
|
])
|
|
|
|
# gl_SYS_RANDOM_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_SYS_RANDOM_MODULE_INDICATOR],
|
|
[
|
|
dnl Ensure to expand the default settings once only.
|
|
gl_SYS_RANDOM_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_SYS_RANDOM_H_REQUIRE_DEFAULTS],
|
|
[
|
|
m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM])
|
|
])
|
|
m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS])
|
|
AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS])
|
|
])
|
|
|
|
AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS],
|
|
[
|
|
dnl Assume proper GNU behavior unless another module says otherwise.
|
|
HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM])
|
|
REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM])
|
|
])
|