diff options
| author | Paul Eggert | 2017-08-09 11:38:04 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-08-09 11:46:06 -0700 |
| commit | 904be8c4cf8522a54a85542954bd553b6dbd0b64 (patch) | |
| tree | 7f0c1eac5585e02a5461b36224490938cbcf3e92 /admin | |
| parent | 7fc27ea70bc7dc24776b2c098ac970f2f21e37fb (diff) | |
| download | emacs-904be8c4cf8522a54a85542954bd553b6dbd0b64.tar.gz emacs-904be8c4cf8522a54a85542954bd553b6dbd0b64.zip | |
Merge from gnulib
This incorporates:
2017-08-09 tempname: do not depend on secure_getenv
2017-08-08 extensions: add _OPENBSD_SOURCE
2017-08-06 manywarnings: Add support for C++
2017-08-06 warnings, manywarnings: Add support for multiple languages
* admin/merge-gnulib: Don't use m4/manywarnings-c++.m4.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/secure_getenv.c, m4/secure_getenv.m4: Remove.
* lib/tempname.c, m4/extensions.m4, m4/manywarnings.m4, m4/warnings.m4:
Copy from gnulib.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index c23e8a40ea7..a16d7fa53ea 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -106,6 +106,7 @@ done | |||
| 106 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ | 106 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ |
| 107 | "$src"m4/gl-openssl.m4 \ | 107 | "$src"m4/gl-openssl.m4 \ |
| 108 | "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ | 108 | "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ |
| 109 | "$src"m4/manywarnings-c++.m4 \ | ||
| 109 | "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 && | 110 | "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 && |
| 110 | cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && | 111 | cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && |
| 111 | cp -- "$gnulib_srcdir"/build-aux/config.guess \ | 112 | cp -- "$gnulib_srcdir"/build-aux/config.guess \ |