Work around unportability of nl_langinfo(CODESET).
commitc6c542aae559e6e6d1ed89e9c1f5a0bb8d386c14
authorWerner LEMBERG <wl@gnu.org>
Tue, 10 Jan 2006 09:43:43 +0000 (10 09:43 +0000)
committerWerner LEMBERG <wl@gnu.org>
Tue, 10 Jan 2006 09:43:43 +0000 (10 09:43 +0000)
treedac01f74d5a2a003178ca852330b9c4d6529a60a
parent6522093c924e8a1f20c7b70ed2a085e3fa0cb8db
Work around unportability of nl_langinfo(CODESET).

* m4/glibc21.m4: New file, from gnulib.
* Makefile.sub (M4MACROS): Add m4/glibc21.m4.
* configure.ac: Also test for stddef.h, and invoke jm_GLIBC21.
* Makefile.in (HOST, GLIBC21): New variables.
(MDEFINES): Pass them to subdirectories.
* src/include/relocate.h (relocatep): Define with C linkage.
* src/include/localcharset.h: New file, from gnulib.
* src/libs/libgroff/localcharset.c: New file, from gnulib with a
modification for relocate().
* src/libs/libgroff/config.charset: New file, from gnulib.
* src/libs/libgroff/ref-add.sin: New file, from gnulib.
* src/libs/libgroff/ref-del.sin: New file, from gnulib.
* src/libs/libgroff/Makefile.sub (EXTRA_CFLAGS): Also define LIBDIR.
(OBJS): Add localcharset.o.
(CSRCS): Add localcharset.c.
(all): Add dependencies to charset.alias, ref-add.sed, ref-del.sed.
(charset.alias): New rule.
(PACKAGE): New variable.
(ref-add.sed, ref-del.sed): New rules.
(MKINSTALLDIRS): New variable.
(install_data): Depend on install_charset_data.
(install_charset_data): New rule for creating or updating
charset.alias.
(uninstall_sub): Depend on uninstall_charset_data.
(uninstall_charset_data): New rule for uninstalling or updating
charset.alias.
* src/preproc/preconv/preconv.cpp: Include localcharset.h instead
of <langinfo.h>.
(main): Initialize default_encoding from locale_charset() instead of
nl_langinfo(CODESET).

* aclocal.m4, configure, src/include/config.hin: Regenerated.
16 files changed:
ChangeLog
Makefile.in
Makefile.sub
aclocal.m4
configure
configure.ac
m4/glibc21.m4 [new file with mode: 0644]
src/include/config.hin
src/include/localcharset.h [new file with mode: 0644]
src/include/relocate.h
src/libs/libgroff/Makefile.sub
src/libs/libgroff/config.charset [new file with mode: 0755]
src/libs/libgroff/localcharset.c [new file with mode: 0644]
src/libs/libgroff/ref-add.sin [new file with mode: 0644]
src/libs/libgroff/ref-del.sin [new file with mode: 0644]
src/preproc/preconv/preconv.cpp