diff options
| author | Bruno Haible <bruno@clisp.org> | 2018-05-19 17:17:32 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2018-05-20 13:16:19 +0200 |
| commit | bb5cc1c59c039836699b096a27a82b0d1abee038 (patch) | |
| tree | ec8ce3face8adf24fbf720d01e2f4098b1acdfec /m4 | |
| parent | 9d70137bfec6f93a90eb77f63536dda25672152d (diff) | |
| download | gnulib-bb5cc1c59c039836699b096a27a82b0d1abee038.tar.gz | |
localcharset: Move mapping tables into the code.
* lib/localcharset.h: Document the GNU canonical names for character
encodings here.
* lib/localcharset.c: Don't include <fcntl.h>, <unistd.h>,
relocatable.h, configmake.h.
(O_NOFOLLOW, ISSLASH, DIRECTORY_SEPARATOR, getc, volatile): Remove
macros.
(charset_aliases): Remove variable.
(get_charset_aliases): Remove function.
(struct table_entry): New type.
(alias_table, locale_table): New constants.
(locale_charset): Use the alias_table or locale_table to get the
canonicalized encoding name.
* lib/config.charset: Remove file.
* lib/ref-add.sin: Remove file.
* lib/ref-del.sin: Remove file.
* m4/localcharset.m4 (gl_LOCALCHARSET): Don't require gl_FCNTL_O_FLAGS,
AC_CANONICAL_HOST, gl_GLIBC21. Don't check for getc_unlocked.
* modules/localcharset (Notice): Remove.
(Files): Remove config.charset, ref-add.sin, ref-del.sin, fcntl-o.m4,
glibc21.m4.
(Depends-on): Remove configmake.
(configure.ac): Define LOCALCHARSET_TESTS_ENVIRONMENT to empty.
(Makefile.am): Simplify.
* build-aux/prefix-gnulib-mk: Remove special code for the removed files.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/localcharset.m4 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 2d7ca64f59..d38a2c9eb3 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,4 +1,4 @@ -# localcharset.m4 serial 7 +# localcharset.m4 serial 8 dnl Copyright (C) 2002, 2004, 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,10 +8,4 @@ AC_DEFUN([gl_LOCALCHARSET], [ dnl Prerequisites of lib/localcharset.c. AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_REQUIRE([gl_FCNTL_O_FLAGS]) - AC_CHECK_DECLS_ONCE([getc_unlocked]) - - dnl Prerequisites of the lib/Makefile.am snippet. - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_GLIBC21]) ]) |