summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorwl <wl>2006-01-10 09:43:43 +0000
committerwl <wl>2006-01-10 09:43:43 +0000
commit277273f8a652d7ffbb483590caebe4f509575ce2 (patch)
treeeb6a7a985b490bca3c5146f624622745bef1a4d1 /aclocal.m4
parent3c937d410b08b3a55a6b91ca18cf6f0c0f1139bf (diff)
downloadgroff-277273f8a652d7ffbb483590caebe4f509575ce2.tar.gz
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.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 705b6d91..2c0b0ed6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -12,6 +12,7 @@
# PARTICULAR PURPOSE.
m4_include([m4/codeset.m4])
+m4_include([m4/glibc21.m4])
m4_include([m4/groff.m4])
m4_include([m4/iconv.m4])
m4_include([m4/lib-ld.m4])