diff options
| author | wl <wl> | 2006-01-10 09:43:43 +0000 |
|---|---|---|
| committer | wl <wl> | 2006-01-10 09:43:43 +0000 |
| commit | 277273f8a652d7ffbb483590caebe4f509575ce2 (patch) | |
| tree | eb6a7a985b490bca3c5146f624622745bef1a4d1 /configure.ac | |
| parent | 3c937d410b08b3a55a6b91ca18cf6f0c0f1139bf (diff) | |
| download | groff-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 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index beaaba8b..36e120dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Autoconf configuration file for groff. -# Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is part of groff. @@ -51,7 +51,7 @@ GROFF_CSH_HACK([SH_SCRIPT_SED_CMD='1s/.*/:/'], [SH_SCRIPT_SED_CMD='1s/a/a/']) AC_SUBST([SH_SCRIPT_SED_CMD]) # checks for headers -AC_CHECK_HEADERS([stdlib.h unistd.h dirent.h limits.h sys/dir.h \ +AC_CHECK_HEADERS([stddef.h stdlib.h unistd.h dirent.h limits.h sys/dir.h \ string.h strings.h math.h sys/time.h direct.h process.h]) GROFF_ISC_SYSV3 GROFF_POSIX @@ -121,6 +121,7 @@ GROFF_TARGET_PATH_SEPARATOR GROFF_HTML_PROGRAMS GROFF_PDFDOC_PROGRAMS GROFF_PNMTOPS_NOSETPAGE +jm_GLIBC21 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_CONFIG_FILES([Makefile doc/Makefile src/utils/xtotroff/Makefile]) |