diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 02:33:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 02:35:36 -0800 |
| commit | 65eee8392ff95f58f7b0bd036e1fe065523658c6 (patch) | |
| tree | fe19edae158f948c08d3f2600bc776fa5696f94d /admin | |
| parent | aaf1f4a33c96831b9835574b8bfc6f71ec647fdd (diff) | |
| download | emacs-65eee8392ff95f58f7b0bd036e1fe065523658c6.tar.gz | |
Do not use Gnulib’s m4/wint_t.m4.
* admin/merge-gnulib: Remove m4/wint_t.m4 when merging.
Fix typo so that warn-on-use.m4 is removed too.
* configure.ac (gt_TYPE_WINT_T): New macro, replacing Gnulib’s.
* m4/wint_t.m4: Remove.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 69db30cc41e..20a3240ea89 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -96,7 +96,7 @@ test -x "$gnulib_srcdir"/gnulib-tool || { "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ "$src"m4/gl-openssl.m4 \ - "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && + "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && { test -z "$src" || cd "$src"; } && |