diff options
| author | Paul Eggert | 2023-05-14 18:51:22 -0700 |
|---|---|---|
| committer | Paul Eggert | 2023-05-14 19:28:09 -0700 |
| commit | 8c0671b9cbf56bec99a7de63ead33076abb754b1 (patch) | |
| tree | ec2704f2e09e6a4d0b907a9498c03510801ace63 /admin | |
| parent | b77d357ea356134fbc159797b34498b7a0006dc9 (diff) | |
| download | emacs-8c0671b9cbf56bec99a7de63ead33076abb754b1.tar.gz emacs-8c0671b9cbf56bec99a7de63ead33076abb754b1.zip | |
Avoid duplicate configure-time codeset tests
* admin/merge-gnulib: Copy m4/codeset.m4 too. This is mostly for
documentation, as it’s now automatically copied by other modules.
* configure.ac (EMACS_PAPER_WIDTH): New macro. This relies on
Gnulib, to avoid duplicate tests for HAVE_LANGINFO_CODESET.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 917ddda1fd5..7c82be98608 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -132,5 +132,7 @@ cp -- "$gnulib_srcdir"/build-aux/config.guess \ | |||
| 132 | cp -- "$gnulib_srcdir"/lib/af_alg.h \ | 132 | cp -- "$gnulib_srcdir"/lib/af_alg.h \ |
| 133 | "$gnulib_srcdir"/lib/save-cwd.h \ | 133 | "$gnulib_srcdir"/lib/save-cwd.h \ |
| 134 | "$src"lib && | 134 | "$src"lib && |
| 135 | cp -- "$gnulib_srcdir"/m4/codeset.m4 \ | ||
| 136 | "$src"m4 && | ||
| 135 | { test -z "$src" || cd "$src"; } && | 137 | { test -z "$src" || cd "$src"; } && |
| 136 | ./autogen.sh | 138 | ./autogen.sh |