diff options
| author | wl <wl> | 2012-02-26 23:40:11 +0000 |
|---|---|---|
| committer | wl <wl> | 2012-02-26 23:40:11 +0000 |
| commit | 24cd67d24549733edaf3aa9cd06d454ec059cc68 (patch) | |
| tree | 18d3853d90a34d83eae1d01defab72c006d8007c /configure.ac | |
| parent | 57b1f3fff43204b4d5b1653ed31173158fa6b2b6 (diff) | |
| download | groff-24cd67d24549733edaf3aa9cd06d454ec059cc68.tar.gz | |
Update configuration files from `gnulib' and `config' repositories..
This also fixes a problem with `iconv' on Solaris 10, as reported in
http://lists.gnu.org/archive/html/bug-groff/2012-02/msg00007.html
* configure.ac: Call `gl_LOCALCHARSET.
Call `AM_ICONV' as C++.
* config.guess, config.rpath, config.sub, install-sh, mkinstalldirs:
Updated.
* m4/codeset.m4, m4/glib21.m4, m4/iconv.m4, m4/lib-ld.m4,
m4/lib-link.m4, m4/lib-prefix.m4: Updated.
* m4/fcntl-o.m4, m4/localcharset.m4: New files.
* Makefile.in: Updated.
* src/include/localcharset.h, src/libs/libgroff/config.charset,
src/libs/libgroff/localcharset.c: Updated.
* aclocal.m4, configure, src/include/config.hin: Regenerated.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 16ded279..5ce392d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Autoconf configuration file for groff. -# Copyright (C) 1989-1995, 2001-2007, 2009, 2011 +# Copyright (C) 1989-1995, 2001-2007, 2009, 2011-2012 # Free Software Foundation, Inc. # # This file is part of groff. @@ -115,7 +115,10 @@ AC_C_BIGENDIAN # checks for libraries GROFF_LIBC GROFF_LIBM + +AC_LANG_PUSH([C++]) AM_ICONV +AC_LANG_POP([C++]) # we need LIBEXT AC_SUBST([LIBEXT],[$acl_libext]) @@ -151,6 +154,7 @@ GROFF_HTML_PROGRAMS GROFF_PDFDOC_PROGRAMS GROFF_PNMTOPS_NOSETPAGE gl_GLIBC21 +gl_LOCALCHARSET AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_CONFIG_FILES([Makefile doc/Makefile src/utils/xtotroff/Makefile]) |