mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-03 08:30:09 +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.
47 lines
1.4 KiB
Plaintext
47 lines
1.4 KiB
Plaintext
# environ.m4 serial 8
|
|
dnl Copyright (C) 2001-2004, 2006-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_ENVIRON],
|
|
[
|
|
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
|
|
dnl Persuade glibc <unistd.h> to declare environ.
|
|
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
|
|
|
AC_CHECK_HEADERS_ONCE([unistd.h])
|
|
gt_CHECK_VAR_DECL(
|
|
[#if HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
/* mingw, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>. */
|
|
#include <stdlib.h>
|
|
],
|
|
[environ])
|
|
if test $gt_cv_var_environ_declaration != yes; then
|
|
HAVE_DECL_ENVIRON=0
|
|
fi
|
|
])
|
|
|
|
# Check if a variable is properly declared.
|
|
# gt_CHECK_VAR_DECL(includes,variable)
|
|
AC_DEFUN([gt_CHECK_VAR_DECL],
|
|
[
|
|
define([gt_cv_var], [gt_cv_var_]$2[_declaration])
|
|
AC_CACHE_CHECK([if $2 is properly declared], [gt_cv_var],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[$1
|
|
typedef struct { int foo; } foo_t;
|
|
extern foo_t $2;]],
|
|
[[$2.foo = 1;]])],
|
|
[gt_cv_var=no],
|
|
[gt_cv_var=yes])])
|
|
if test $gt_cv_var = yes; then
|
|
AC_DEFINE([HAVE_]m4_translit($2, [a-z], [A-Z])[_DECL], 1,
|
|
[Define if you have the declaration of $2.])
|
|
fi
|
|
undefine([gt_cv_var])
|
|
])
|