From 277273f8a652d7ffbb483590caebe4f509575ce2 Mon Sep 17 00:00:00 2001 From: wl Date: Tue, 10 Jan 2006 09:43:43 +0000 Subject: 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 . (main): Initialize default_encoding from locale_charset() instead of nl_langinfo(CODESET). * aclocal.m4, configure, src/include/config.hin: Regenerated. --- Makefile.sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.sub') diff --git a/Makefile.sub b/Makefile.sub index 26dfda11..ddb18fcf 100644 --- a/Makefile.sub +++ b/Makefile.sub @@ -14,7 +14,7 @@ CLEANADD=Makefile.cfg conftest* M4MACROS = \ $(srcdir)/m4/groff.m4 \ - $(srcdir)/m4/codeset.m4 \ + $(srcdir)/m4/codeset.m4 $(srcdir)/m4/glibc21.m4 \ $(srcdir)/m4/iconv.m4 \ $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-ld.m4 $(srcdir)/m4/lib-prefix.m4 -- cgit v1.2.1