[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ./ChangeLog ./Makefile.in ./Makefile.sub ...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff ./ChangeLog ./Makefile.in ./Makefile.sub ... |
|
Date: |
Wed, 04 Jan 2006 09:21:43 +0100 (CET) |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 06/01/03 23:57:03
Modified files:
. : ChangeLog Makefile.in Makefile.sub aclocal.m4
configure configure.ac
doc : Makefile.in Makefile.sub webpage.ms
src/include : config.hin
src/preproc/preconv: Makefile.sub preconv.cpp
tmac : groff_www.man www.tmac
Added files:
. : config.guess config.rpath config.sub
m4 : codeset.m4 groff.m4 iconv.m4 lib-ld.m4
lib-link.m4 lib-prefix.m4
Log message:
* m4/groff.m4: Renamed from aclocal.m4.
* m4/codeset.m4: New file, from gnulib.
* m4/iconv.m4: New file, from gnulib.
* m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
gnulib.
* config.rpath: New file, from gnulib.
* config.guess, config.sub: New files, from gnulib.
* Makefile.sub (M4MACROS): New variable.
(configure): Fix typo.
(aclocal.m4): New rule.
(stamp-h.in): Depend on aclocal.m4.
* configure.ac: Invoke AM_ICONV and AM_LANGINFO_CODESET.
* Makefile.in (LIBICONV): New variable.
(MDEFINES): Pass it to recursive makes.
* src/preproc/preconv/preconv.cpp: Use HAVE_LANGINFO_CODESET and
HAVE_ICONV instead of I18N macro.
* src/preproc/preconv/Makefile.sub (EXTRA_LDFLAGS): New variable.
* aclocal.m4, configure, src/include/config.hin: (Re)generated.
* doc/Makefile.in (webpage.html): Simplify.
* doc/Makefile.sub (webpage.html): Synchronize with doc/Makefile.in.
* doc/webpage.ms, tmac/groff_www.man, tmac/www.tmac: Minor updates.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.874&tr2=1.875&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/Makefile.in.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/Makefile.sub.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/aclocal.m4.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/config.guess?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/config.rpath?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/config.sub?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/configure.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/configure.ac.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/doc/Makefile.in.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/doc/webpage.ms.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/m4/codeset.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/m4/groff.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/m4/iconv.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/m4/lib-ld.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/m4/lib-link.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/m4/lib-prefix.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/include/config.hin.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/Makefile.sub.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/preconv.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/tmac/groff_www.man.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.874 groff/ChangeLog:1.875
--- groff/ChangeLog:1.874 Sun Jan 1 18:15:05 2006
+++ groff/ChangeLog Tue Jan 3 23:57:03 2006
@@ -1,3 +1,31 @@
+2006-01-03 Bruno Haible <address@hidden>
+
+ * m4/groff.m4: Renamed from aclocal.m4.
+ * m4/codeset.m4: New file, from gnulib.
+ * m4/iconv.m4: New file, from gnulib.
+ * m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
+ gnulib.
+ * config.rpath: New file, from gnulib.
+ * config.guess, config.sub: New files, from gnulib.
+ * Makefile.sub (M4MACROS): New variable.
+ (configure): Fix typo.
+ (aclocal.m4): New rule.
+ (stamp-h.in): Depend on aclocal.m4.
+ * configure.ac: Invoke AM_ICONV and AM_LANGINFO_CODESET.
+ * Makefile.in (LIBICONV): New variable.
+ (MDEFINES): Pass it to recursive makes.
+ * src/preproc/preconv/preconv.cpp: Use HAVE_LANGINFO_CODESET and
+ HAVE_ICONV instead of I18N macro.
+ * src/preproc/preconv/Makefile.sub (EXTRA_LDFLAGS): New variable.
+
+ * aclocal.m4, configure, src/include/config.hin: (Re)generated.
+
+2006-01-03 Werner LEMBERG <address@hidden>
+
+ * doc/Makefile.in (webpage.html): Simplify.
+ * doc/Makefile.sub (webpage.html): Synchronize with doc/Makefile.in.
+ * doc/webpage.ms, tmac/groff_www.man, tmac/www.tmac: Minor updates.
+
2006-01-01 Werner LEMBERG <address@hidden>
* tmac/doc-common (Os): Add some Darwin versions.
@@ -100,21 +128,21 @@
2005-11-28 Gaius Mulley <address@hidden>
- * doc/Makefile.in: separate rule for webpage.html so that extra
- command line options can be passed to grohtml.
- * doc/groff.css: changed all margins to 0%.
- * doc/webpage.ms: now uses new macros ALN, LNS and LNE
- so that left navigation is exploited. Also updated webpage to
- contain new sections on licences, mailing lists, cvs/ftp
- access, groff dependencies and bug reports.
- * tmac/groff_www.man: documented the new macros ALN, LNS and LNE.
- * tmac/www.tmac: implemented the new macros ALN, LNS and LNE.
+ * doc/Makefile.in: Separate rule for webpage.html so that extra
+ command line options can be passed to grohtml.
+ * doc/groff.css: Change all margins to 0%.
+ * doc/webpage.ms: Now use new macros ALN, LNS, and LNE so that left
+ navigation is exploited. Also update webpage to contain new
+ sections on licences, mailing lists, cvs/ftp access, groff
+ dependencies, and bug reports.
+ * tmac/groff_www.man: Document the new macros ALN, LNS, and LNE.
+ * tmac/www.tmac: Implement the new macros ALN, LNS, and LNE.
2005-11-25 Gaius Mulley <address@hidden>
* src/devices/grohtml/post-html.cpp
(html_printer::do_file_components): Add fputs calls to emit the
- head contents and shutdown the head tag whenever a new file
+ head contents and shut down the head tag whenever a new file
component is generated.
2005-11-22 Gaius Mulley <address@hidden>
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.90 groff/Makefile.in:1.91
--- groff/Makefile.in:1.90 Sat Dec 31 08:26:57 2005
+++ groff/Makefile.in Tue Jan 3 23:57:03 2006
@@ -278,8 +278,10 @@
# -DHAVE_FMOD if you have fmod()
# -DHAVE_GETCWD if you have getcwd()
# -DHAVE_GETTIMEOFDAY if you have gettimeofday()
+# -DHAVE_ICONV if you have iconv()
# -DHAVE_ISATTY if you have isatty()
# -DHAVE_KILL if you have kill()
+# -DHAVE_LANGINFO_CODESET if you have nl_langinfo()
# -DHAVE_MKSTEMP if you have mkstemp()
# -DHAVE_MMAP if you have mmap()
# -DHAVE_PUTENV if you have putenv()
@@ -324,6 +326,7 @@
# -DLONG_FOR_TIME_T if localtime() takes a long * not a time_t *
# -DHAVE_STRUCT_EXCEPTION if <math.h> defines struct exception
# -DRETSIGTYPE=int if signal handlers return int not void
+# -DICONV_CONST=const if declaration of iconv() needs const
# -DIS_EBCDIC_HOST if the host's encoding is EBCDIC
# -DPAGE=A4 if the the printer's page size is A4
# -DGHOSTSCRIPT=gs the name (and directory if required) of the
@@ -368,6 +371,7 @@
LIBEXT=`case $(OBJEXT) in obj) echo lib;; *) echo a;; esac`
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
@@ -422,6 +426,7 @@
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
"LDFLAGS=$(LDFLAGS)" \
"LIBEXT=$(LIBEXT)" \
+ "LIBICONV=$(LIBICONV)" \
"LIBM=$(LIBM)" \
"LIBOBJS=$(LIBOBJS)" \
"LIBS=$(LIBS)" \
Index: groff/Makefile.sub
diff -u groff/Makefile.sub:1.11 groff/Makefile.sub:1.12
--- groff/Makefile.sub:1.11 Fri Oct 15 05:21:55 2004
+++ groff/Makefile.sub Tue Jan 3 23:57:03 2006
@@ -12,17 +12,26 @@
groff.log
CLEANADD=Makefile.cfg conftest*
+M4MACROS = \
+ $(srcdir)/m4/groff.m4 \
+ $(srcdir)/m4/codeset.m4 \
+ $(srcdir)/m4/iconv.m4 \
+ $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-ld.m4 $(srcdir)/m4/lib-prefix.m4
+
distfiles: configure
-$(scrdir)/configure: configure.ac aclocal.m4
+$(srcdir)/configure: configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && autoconf
+$(srcdir)/aclocal.m4: $(M4MACROS)
+ cd $(srcdir) && aclocal -I m4
+
config.status: configure
$(SHELL) config.status --recheck
# autoheader might not change config.hin, so touch a stamp file.
$(srcdir)/config.hin: stamp-h.in
-$(srcdir)/stamp-h.in: configure.ac aclocal.m4
+$(srcdir)/stamp-h.in: configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && autoheader
echo timestamp > $(srcdir)/stamp-h.in
Index: groff/aclocal.m4
diff -u groff/aclocal.m4:1.53 groff/aclocal.m4:1.54
--- groff/aclocal.m4:1.53 Mon Dec 12 07:14:59 2005
+++ groff/aclocal.m4 Tue Jan 3 23:57:03 2006
@@ -1,1205 +1,19 @@
-# Autoconf macros for groff.
-# Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is part of groff.
-#
-# groff is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2, or (at your option) any later
-# version.
-#
-# groff is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with groff; see the file COPYING. If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-AC_DEFUN([GROFF_PRINT],
- [if test -z "$PSPRINT"; then
- AC_CHECK_PROGS([LPR], [lpr])
- AC_CHECK_PROGS([LP], [lp])
- if test -n "$LPR" && test -n "$LP"; then
- # HP-UX provides an lpr command that emulates lpr using lp,
- # but it doesn't have lpq; in this case we want to use lp
- # rather than lpr.
- AC_CHECK_PROGS([LPQ], [lpq])
- test -n "$LPQ" || LPR=
- fi
- if test -n "$LPR"; then
- PSPRINT="$LPR"
- elif test -n "$LP"; then
- PSPRINT="$LP"
- fi
- fi
- AC_SUBST([PSPRINT])
- AC_MSG_CHECKING([for command to use for printing PostScript files])
- AC_MSG_RESULT([$PSPRINT])
-
- # Figure out DVIPRINT from PSPRINT.
- AC_MSG_CHECKING([for command to use for printing dvi files])
- if test -n "$PSPRINT" && test -z "$DVIPRINT"; then
- if test "x$PSPRINT" = "xlpr"; then
- DVIPRINT="lpr -d"
- else
- DVIPRINT="$PSPRINT"
- fi
- fi
- AC_SUBST([DVIPRINT])
- AC_MSG_RESULT([$DVIPRINT])])
-
-# Bison generated parsers have problems with C++ compilers other than g++.
-# So byacc is preferred over bison.
-
-AC_DEFUN([GROFF_PROG_YACC],
- [AC_CHECK_PROGS([YACC], [byacc 'bison -y'], [yacc])])
-
-# We need makeinfo 4.8 or newer.
-
-AC_DEFUN([GROFF_MAKEINFO],
- [missing=
- AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo])
- if test -z "$MAKEINFO"; then
- missing="\`makeinfo' is missing."
- else
- AC_MSG_CHECKING([for makeinfo version])
- # We need an additional level of quoting to make sed's regexps work.
- [makeinfo_version=`$MAKEINFO --version 2>&1 \
- | sed -e 's/^.* \([^ ][^ ]*\)$/\1/' -e '1q'`]
- AC_MSG_RESULT([$makeinfo_version])
- # Consider only the first two numbers in version number string.
- [makeinfo_version_major=`echo $makeinfo_version \
- | sed 's/^\([0-9]*\).*$/\1/'`]
- if test -z "$makeinfo_version_major"; then
- makeinfo_version_major=0
- makeinfo_version_minor=0
- else
- [makeinfo_version_minor=`echo $makeinfo_version \
- | sed 's/^[^.][^.]*\(.*\)$/\1/'`]
- # No minor version number at all?
- if test -z "$makeinfo_version_minor"; then
- makeinfo_version_minor=0
- else
- [makeinfo_version_minor=`echo $makeinfo_version_minor \
- | sed 's/\.\([0-9]*\).*$/\1/'`]
- if test -z "$makeinfo_version_minor"; then
- makeinfo_version_minor=0
- fi
- fi
- fi
- fi
- makeinfo_version_numeric=`expr $makeinfo_version_major '*' 1000 \
- '+' $makeinfo_version_minor`
- if test $makeinfo_version_numeric -lt 4008; then
- missing="\`makeinfo' is too old."
- fi
-
- if test -n "$missing"; then
- if test ! -f doc/groff.info \
- || test ${srcdir}/doc/groff.texinfo -nt doc/groff.info; then
- AC_MSG_ERROR($missing
-[Get the `texinfo' package version 4.8 or newer.])
- else
- AC_MSG_WARN($missing
-[Get the `texinfo' package version 4.8 or newer if you want to convert
-`groff.texinfo' into a PDF or HTML document.])
- fi
- fi
- AC_SUBST([MAKEINFO])])
-
-# The following programs are needed for grohtml.
-
-AC_DEFUN([GROFF_HTML_PROGRAMS],
- [AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
- make_html=html
- make_install_html=install_html
-
- missing=
- AC_FOREACH([groff_prog],
- [pnmcut pnmcrop pnmtopng psselect pnmtops],
- [AC_CHECK_PROG(groff_prog, groff_prog, [found], [missing])
- if test $[]groff_prog = missing; then
- missing="$missing \`groff_prog'"
- fi;])
-
- test "$GHOSTSCRIPT" = "missing" && missing="$missing \`gs'"
-
- if test -n "$missing"; then
- plural=`set $missing; test $[#] -gt 1 && echo s`
- missing=`set $missing
- missing=""
- while test $[#] -gt 0
- do
- case $[#] in
- 1) missing="$missing$[1]" ;;
- 2) missing="$missing$[1] and " ;;
- *) missing="$missing$[1], " ;;
- esac
- shift
- done
- echo $missing`
-
- make_html=
- make_install_html=
-
- AC_MSG_WARN([missing program$plural:
-
- The program$plural
- $missing
- cannot be found in the PATH.
- Consequently, groff's HTML backend (grohtml) will not work properly;
- therefore, it will neither be possible to prepare, nor to install,
- documentation in HTML format.
- ])
- fi
-
- AC_SUBST([make_html])
- AC_SUBST([make_install_html])])
-
-# To produce PDF docs, we need both awk and ghostscript.
-
-AC_DEFUN([GROFF_PDFDOC_PROGRAMS],
- [AC_REQUIRE([GROFF_AWK_PATH])
- AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
-
- make_pdfdoc=pdfdoc
- make_install_pdfdoc=install_pdfdoc
-
- missing=""
- test "$AWK" = missing && missing="\`awk'"
- test "$GHOSTSCRIPT" = missing && missing="$missing \`gs'"
- if test -n "$missing"; then
- plural=`set $missing; test $[#] -eq 2 && echo s`
- test x$plural = xs \
- && missing=`set $missing; echo "$[1] and $[2]"` \
- || missing=`echo $missing`
-
- make_pdfdoc=
- make_install_pdfdoc=
-
- AC_MSG_WARN([missing program$plural:
-
- The program$plural $missing cannot be found in the PATH.
- Consequently, groff's PDF formatter (pdfroff) will not work properly;
- therefore, it will neither be possible to prepare, nor to install,
- documentation in PDF format.
- ])
- fi
-
- AC_SUBST([make_pdfdoc])
- AC_SUBST([make_install_pdfdoc])])
-
-# Check whether pnmtops can handle the -nosetpage option.
-
-AC_DEFUN([GROFF_PNMTOPS_NOSETPAGE],
- [AC_MSG_CHECKING([whether pnmtops can handle the -nosetpage option])
- if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then
- AC_MSG_RESULT([yes])
- pnmtops_nosetpage="pnmtops -nosetpage"
- else
- AC_MSG_RESULT([no])
- pnmtops_nosetpage="pnmtops"
- fi
- AC_SUBST([pnmtops_nosetpage])])
-
-# Check location of `gs'; allow `--with-gs=PROG' option to override.
-
-AC_DEFUN([GROFF_GHOSTSCRIPT_PATH],
- [AC_REQUIRE([GROFF_GHOSTSCRIPT_PREFS])
- AC_ARG_WITH([gs],
- [AS_HELP_STRING([--with-gs=PROG],
- [actual [/path/]name of ghostscript executable])],
- [GHOSTSCRIPT=$withval],
- [AC_CHECK_TOOLS(GHOSTSCRIPT, [$ALT_GHOSTSCRIPT_PROGS], [missing])])
- test "$GHOSTSCRIPT" = "no" && GHOSTSCRIPT=missing])
-
-# Preferences for choice of `gs' program...
-# (allow --with-alt-gs="LIST" to override).
-
-AC_DEFUN([GROFF_GHOSTSCRIPT_PREFS],
- [AC_ARG_WITH([alt-gs],
- [AS_HELP_STRING([--with-alt-gs=LIST],
- [alternative names for ghostscript executable])],
- [ALT_GHOSTSCRIPT_PROGS="$withval"],
- [ALT_GHOSTSCRIPT_PROGS="gs gswin32c gsos2"])
- AC_SUBST([ALT_GHOSTSCRIPT_PROGS])])
-
-# Check location of `awk'; allow `--with-awk=PROG' option to override.
-
-AC_DEFUN([GROFF_AWK_PATH],
- [AC_REQUIRE([GROFF_AWK_PREFS])
- AC_ARG_WITH([awk],
- [AS_HELP_STRING([--with-awk=PROG],
- [actual [/path/]name of awk executable])],
- [AWK=$withval],
- [AC_CHECK_TOOLS(AWK, [$ALT_AWK_PROGS], [missing])])
- test "$AWK" = "no" && AWK=missing])
-
-# Preferences for choice of `awk' program; allow --with-alt-awk="LIST"
-# to override.
-
-AC_DEFUN([GROFF_AWK_PREFS],
- [AC_ARG_WITH([alt-awk],
- [AS_HELP_STRING([--with-alt-awk=LIST],
- [alternative names for awk executable])],
- [ALT_AWK_PROGS="$withval"],
- [ALT_AWK_PROGS="gawk mawk nawk awk"])
- AC_SUBST([ALT_AWK_PROGS])])
-
-# GROFF_CSH_HACK(if hack present, if not present)
-
-AC_DEFUN([GROFF_CSH_HACK],
- [AC_MSG_CHECKING([for csh hash hack])
-
-cat <<EOF >conftest.sh
-#! /bin/sh
-true || exit 0
-export PATH || exit 0
-exit 1
-EOF
-
- chmod +x conftest.sh
- if echo ./conftest.sh | (csh >/dev/null 2>&1) >/dev/null 2>&1; then
- AC_MSG_RESULT([yes])
- $1
- else
- AC_MSG_RESULT([no])
- $2
- fi
- rm -f conftest.sh])
-
-# From address@hidden (Hans Zuidam)
-
-AC_DEFUN([GROFF_ISC_SYSV3],
- [AC_MSG_CHECKING([for ISC 3.x or 4.x])
- if grep ['[34]\.'] /usr/options/cb.name >/dev/null 2>&1
- then
- AC_MSG_RESULT([yes])
- AC_DEFINE([_SYSV3], [1], [Define if you have ISC 3.x or 4.x.])
- else
- AC_MSG_RESULT([no])
- fi])
-
-AC_DEFUN([GROFF_POSIX],
- [AC_MSG_CHECKING([whether -D_POSIX_SOURCE is necessary])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <stdio.h>
-extern "C" { void fileno(int); }
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([_POSIX_SOURCE], [1],
- [Define if -D_POSIX_SOURCE is necessary.])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP([C++])])
-
-# srand() of SunOS 4.1.3 has return type int instead of void
-
-AC_DEFUN([GROFF_SRAND],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([for return type of srand])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <stdlib.h>
-extern "C" { void srand(unsigned int); }
-
- ]])
- ],
- [AC_MSG_RESULT([void])
- AC_DEFINE([RET_TYPE_SRAND_IS_VOID], [1],
- [Define if srand() returns void not int.])],
- [AC_MSG_RESULT([int])])
- AC_LANG_POP([C++])])
-
-# In April 2005, autoconf's AC_TYPE_SIGNAL is still broken.
-
-AC_DEFUN([GROFF_TYPE_SIGNAL],
- [AC_MSG_CHECKING([for return type of signal handlers])
- for groff_declaration in \
- 'extern "C" void (*signal (int, void (*)(int)))(int);' \
- 'extern "C" void (*signal (int, void (*)(int)) throw ())(int);' \
- 'void (*signal ()) ();'
- do
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-$groff_declaration
-
- ]],
- [[
-
-int i;
-
- ]])
- ],
- [break],
- [continue])
- done
-
- if test -n "$groff_declaration"; then
- AC_MSG_RESULT([void])
- AC_DEFINE([RETSIGTYPE], [void],
- [Define as the return type of signal handlers
- (`int' or `void').])
- else
- AC_MSG_RESULT([int])
- AC_DEFINE([RETSIGTYPE], [int],
- [Define as the return type of signal handlers
- (`int' or `void').])
- fi])
-
-AC_DEFUN([GROFF_SYS_NERR],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([for sys_nerr in <errno.h>, <stdio.h>, or <stdlib.h>])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
- ]],
- [[
-
-int k;
-k = sys_nerr;
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_SYS_NERR], [1],
- [Define if you have sys_nerr in <errno.h>, <stdio.h>, or <stdio.h>.])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_SYS_ERRLIST],
- [AC_MSG_CHECKING([for sys_errlist[] in <errno.h>, <stdio.h>, or <stdlib.h>])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
- ]],
- [[
-
-int k;
-k = (int)sys_errlist[0];
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_SYS_ERRLIST], [1],
- [Define if you have sys_errlist in <errno.h>, <stdio.h>, or
<stdlib.h>.])],
- [AC_MSG_RESULT([no])])])
-
-AC_DEFUN([GROFF_OSFCN_H],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([C++ <osfcn.h>])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <osfcn.h>
-
- ]],
- [[
-
-read(0, 0, 0);
-open(0, 0);
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_CC_OSFCN_H], [1],
- [Define if you have a C++ <osfcn.h>.])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_LIMITS_H],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([C++ <limits.h>])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <limits.h>
-
- ]],
- [[
-
-int x = INT_MIN;
-int y = INT_MAX;
-int z = UCHAR_MAX;
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_CC_LIMITS_H], [1],
- [Define if you have a C++ <limits.h>.])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_TIME_T],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([for declaration of time_t])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <time.h>
-
- ]],
- [[
-
-time_t t = time(0);
-struct tm *p = localtime(&t);
-
- ]])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_DEFINE([LONG_FOR_TIME_T], [1],
- [Define if localtime() takes a long * not a time_t *.])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_STRUCT_EXCEPTION],
- [AC_MSG_CHECKING([struct exception])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <math.h>
-
- ]],
- [[
-
-struct exception e;
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_STRUCT_EXCEPTION], [1],
- [Define if <math.h> defines struct exception.])],
- [AC_MSG_RESULT([no])])])
-
-AC_DEFUN([GROFF_ARRAY_DELETE],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([whether ANSI array delete syntax is supported])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM(, [[
-
-char *p = new char[5];
-delete [] p;
-
- ]])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_DEFINE([ARRAY_DELETE_NEEDS_SIZE], [1],
- [Define if your C++ doesn't understand `delete []'.])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_TRADITIONAL_CPP],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([traditional preprocessor])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#define name2(a, b) a/**/b
-
- ]],
- [[
-
-int name2(foo, bar);
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([TRADITIONAL_CPP], [1],
- [Define if your C++ compiler uses a traditional (Reiser)
preprocessor.])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_WCOREFLAG],
- [AC_MSG_CHECKING([w_coredump])
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
- ]],
- [[
-
-main()
-{
-#ifdef WCOREFLAG
- exit(1);
-#else
- int i = 0;
- ((union wait *)&i)->w_coredump = 1;
- exit(i != 0200);
-#endif
-}
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE(WCOREFLAG, 0200,
- [Define if the 0200 bit of the status returned by wait() indicates
- whether a core image was produced for a process that was terminated
- by a signal.])],
- [AC_MSG_RESULT([no])],
- [AC_MSG_RESULT([no])])])
-
-AC_DEFUN([GROFF_BROKEN_SPOOLER_FLAGS],
- [AC_MSG_CHECKING([default value for grops -b option])
- test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=0
- AC_MSG_RESULT([$BROKEN_SPOOLER_FLAGS])
- AC_SUBST([BROKEN_SPOOLER_FLAGS])])
-
-AC_DEFUN([GROFF_PAGE],
- [AC_MSG_CHECKING([default paper size])
- groff_prefix=$prefix
- test "x$prefix" = "xNONE" && groff_prefix=$ac_default_prefix
- if test -z "$PAGE"; then
- descfile=
- if test -r $groff_prefix/share/groff/font/devps/DESC; then
- descfile=$groff_prefix/share/groff/font/devps/DESC
- elif test -r $groff_prefix/lib/groff/font/devps/DESC; then
- descfile=$groff_prefix/lib/groff/font/devps/DESC
- else
- for f in $groff_prefix/share/groff/*/font/devps/DESC; do
- if test -r $f; then
- descfile=$f
- break
- fi
- done
- fi
-
- if test -n "$descfile"; then
- if grep ['^paperlength[ ]\+841890'] $descfile >/dev/null 2>&1; then
- PAGE=A4
- elif grep ['^papersize[ ]\+[aA]4'] $descfile >/dev/null 2>&1; then
- PAGE=A4
- fi
- fi
- fi
-
- if test -z "$PAGE"; then
- dom=`awk '([$]1 == "dom" || [$]1 == "search") { print [$]2; exit}' \
- /etc/resolv.conf 2>/dev/null`
- if test -z "$dom"; then
- dom=`(domainname) 2>/dev/null | tr -d '+'`
- if test -z "$dom" \
- || test "$dom" = '(none)'; then
- dom=`(hostname) 2>/dev/null | grep '\.'`
- fi
- fi
- # If the top-level domain is two letters and it's not `us' or `ca'
- # then they probably use A4 paper.
- case "$dom" in
- [*.[Uu][Ss]|*.[Cc][Aa])]
- ;;
- [*.[A-Za-z][A-Za-z])]
- PAGE=A4 ;;
- esac
- fi
-
- test -n "$PAGE" || PAGE=letter
- if test "x$PAGE" = "xA4"; then
- AC_DEFINE([PAGEA4], [1],
- [Define if the printer's page size is A4.])
- fi
- AC_MSG_RESULT([$PAGE])
- AC_SUBST([PAGE])])
-
-AC_DEFUN([GROFF_CXX_CHECK],
- [AC_REQUIRE([AC_PROG_CXX])
- AC_LANG_PUSH([C++])
- if test "$cross_compiling" = no; then
- AC_MSG_CHECKING([that C++ compiler can compile simple program])
- fi
- AC_RUN_IFELSE([
- AC_LANG_SOURCE([[
-
-int main() {
- return 0;
-}
-
- ]])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([a working C++ compiler is required])],
- [:])
-
- if test "$cross_compiling" = no; then
- AC_MSG_CHECKING([that C++ static constructors and destructors are called])
- fi
- AC_RUN_IFELSE([
- AC_LANG_SOURCE([[
-
-extern "C" {
- void _exit(int);
-}
-
-int i;
-struct A {
- char dummy;
- A() { i = 1; }
- ~A() { if (i == 1) _exit(0); }
-};
-
-A a;
-
-int main()
-{
- return 1;
-}
-
- ]])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([a working C++ compiler is required])],
- [:])
-
- AC_MSG_CHECKING([that header files support C++])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <stdio.h>
-
- ]],
- [[
-
-fopen(0, 0);
-
- ]])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([header files do not support C++
- (if you are using a version of gcc/g++ earlier than 2.5,
- you should install libg++)])])
- AC_LANG_POP([C++])])
-
-AC_DEFUN([GROFF_TMAC],
- [AC_MSG_CHECKING([for prefix of system macro packages])
- sys_tmac_prefix=
- sys_tmac_file_prefix=
- for d in /usr/share/lib/tmac /usr/lib/tmac; do
- for t in "" tmac.; do
- for m in an s m; do
- f=$d/$t$m
- if test -z "$sys_tmac_prefix" \
- && test -f $f \
- && grep '^\.if' $f >/dev/null 2>&1; then
- sys_tmac_prefix=$d/$t
- sys_tmac_file_prefix=$t
- fi
- done
- done
- done
- AC_MSG_RESULT([$sys_tmac_prefix])
- AC_SUBST([sys_tmac_prefix])
-
- AC_MSG_CHECKING([which system macro packages should be made available])
- tmac_wrap=
- if test "x$sys_tmac_file_prefix" = "xtmac."; then
- for f in $sys_tmac_prefix*; do
- suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
- case "$suff" in
- e)
- ;;
- *)
- grep "Copyright.*Free Software Foundation" $f >/dev/null \
- || tmac_wrap="$tmac_wrap $suff" ;;
- esac
- done
- elif test -n "$sys_tmac_prefix"; then
- files=`echo $sys_tmac_prefix*`
- grep "\\.so" $files >conftest.sol
- for f in $files; do
- case "$f" in
- ${sys_tmac_prefix}e)
- ;;
- *.me)
- ;;
- */ms.*)
- ;;
- *)
- b=`basename $f`
- if grep "\\.so.*/$b\$" conftest.sol >/dev/null \
- || grep -l "Copyright.*Free Software Foundation" $f >/dev/null; then
- :
- else
- suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
- case "$suff" in
- tmac.*)
- ;;
- *)
- tmac_wrap="$tmac_wrap $suff" ;;
- esac
- fi
- esac
- done
- rm -f conftest.sol
- fi
- AC_MSG_RESULT([$tmac_wrap])
- AC_SUBST([tmac_wrap])])
-
-AC_DEFUN([GROFF_G],
- [AC_MSG_CHECKING([for existing troff installation])
- if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1)
2>/dev/null`" = x0; then
- AC_MSG_RESULT([yes])
- g=g
- else
- AC_MSG_RESULT([no])
- g=
- fi
- AC_SUBST([g])])
-
-# We need the path to install-sh to be absolute.
-
-AC_DEFUN([GROFF_INSTALL_SH],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])
- ac_dir=`cd $ac_aux_dir; pwd`
- ac_install_sh="$ac_dir/install-sh -c"])
-
-# Test whether install-info is available.
-
-AC_DEFUN([GROFF_INSTALL_INFO],
- [AC_CHECK_PROGS([INSTALL_INFO], [install-info], [:])])
-
-# At least one UNIX system, Apple Macintosh Rhapsody 5.5,
-# does not have -lm ...
-
-AC_DEFUN([GROFF_LIBM],
- [AC_CHECK_LIB([m], [sin], [LIBM=-lm])
- AC_SUBST([LIBM])])
-
-# ... while the MinGW implementation of GCC for Microsoft Win32
-# does not seem to have -lc.
-
-AC_DEFUN([GROFF_LIBC],
- [AC_CHECK_LIB([c], [main], [LIBC=-lc])
- AC_SUBST([LIBC])])
-
-# Check for EBCDIC -- stolen from the OS390 Unix LYNX port
-
-AC_DEFUN([GROFF_EBCDIC],
- [AC_MSG_CHECKING([whether character set is EBCDIC])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-/* Treat any failure as ASCII for compatibility with existing art.
- Use compile-time rather than run-time tests for cross-compiler
- tolerance. */
-#if '0' != 240
-make an error "Character set is not EBCDIC"
-#endif
-
- ]])
- ],
- [groff_cv_ebcdic="yes"
- TTYDEVDIRS="font/devcp1047"
- AC_MSG_RESULT([yes])
- AC_DEFINE(IS_EBCDIC_HOST, 1,
- [Define if the host's encoding is EBCDIC.])],
- [groff_cv_ebcdic="no"
- TTYDEVDIRS="font/devascii font/devlatin1"
- OTHERDEVDIRS="font/devlj4 font/devlbp"
- AC_MSG_RESULT([no])])
- AC_SUBST([TTYDEVDIRS])
- AC_SUBST([OTHERDEVDIRS])])
-
-# Check for OS/390 Unix. We test for EBCDIC also -- the Linux port (with
-# gcc) to OS/390 uses ASCII internally.
-
-AC_DEFUN([GROFF_OS390],
- [if test "$groff_cv_ebcdic" = "yes"; then
- AC_MSG_CHECKING([for OS/390 Unix])
- case `uname` in
- OS/390)
- CFLAGS="$CFLAGS -D_ALL_SOURCE"
- AC_MSG_RESULT([yes]) ;;
- *)
- AC_MSG_RESULT([no]) ;;
- esac
- fi])
-
-# Check whether we need a declaration for a function.
-#
-# Stolen from GNU bfd.
-
-AC_DEFUN([GROFF_NEED_DECLARATION],
- [AC_MSG_CHECKING([whether $1 must be declared])
- AC_LANG_PUSH([C++])
- AC_CACHE_VAL([groff_cv_decl_needed_$1],
- [AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
-
- ]],
- [[
-
-#ifndef $1
- char *p = (char *) $1;
-#endif
-
- ]])
- ],
- [groff_cv_decl_needed_$1=no],
- [groff_cv_decl_needed_$1=yes])])
- AC_MSG_RESULT([$groff_cv_decl_needed_$1])
- if test $groff_cv_decl_needed_$1 = yes; then
- AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]), [1],
- [Define if your C++ doesn't declare ]$1[().])
- fi
- AC_LANG_POP([C++])])
-
-# If mkstemp() isn't available, use our own mkstemp.cpp file.
-
-AC_DEFUN([GROFF_MKSTEMP],
- [AC_MSG_CHECKING([for mkstemp])
- AC_LANG_PUSH([C++])
- AC_LIBSOURCE([mkstemp.cpp])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <stdlib.h>
-#include <unistd.h>
-int (*f) (char *);
-
- ]],
- [[
-
-f = mkstemp;
-
- ]])
- ],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_MKSTEMP], [1], [Define if you have mkstemp().])],
- [AC_MSG_RESULT([no])
- _AC_LIBOBJ([mkstemp])])
- AC_LANG_POP([C++])])
-
-# Test whether <inttypes.h> exists, doesn't clash with <sys/types.h>,
-# and declares uintmax_t. Taken from the fileutils package.
-
-AC_DEFUN([GROFF_INTTYPES_H],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([C++ <inttypes.h>])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <sys/types.h>
-#include <inttypes.h>
-
- ]],
- [[
-
-uintmax_t i = (uintmax_t)-1;
-
- ]])
- ],
- [groff_cv_header_inttypes_h=yes
- AC_DEFINE([HAVE_CC_INTTYPES_H], [1],
- [Define if you have a C++ <inttypes.h>.])],
- [groff_cv_header_inttypes_h=no])
- AC_MSG_RESULT([$groff_cv_header_inttypes_h])
- AC_LANG_POP([C++])])
-
-# Test for working `unsigned long long'. Taken from the fileutils package.
-
-AC_DEFUN([GROFF_UNSIGNED_LONG_LONG],
- [AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([for unsigned long long])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
-
-unsigned long long ull = 1;
-int i = 63;
-unsigned long long ullmax = (unsigned long long)-1;
-
- ]],
- [[
-
-return ull << i | ull >> i | ullmax / ull | ullmax % ull;
-
- ]])
- ],
- [groff_cv_type_unsigned_long_long=yes],
- [groff_cv_type_unsigned_long_long=no])
- AC_MSG_RESULT([$groff_cv_type_unsigned_long_long])
- AC_LANG_POP([C++])])
-
-# Define uintmax_t to `unsigned long' or `unsigned long long'
-# if <inttypes.h> does not exist. Taken from the fileutils package.
-
-AC_DEFUN([GROFF_UINTMAX_T],
- [AC_REQUIRE([GROFF_INTTYPES_H])
- if test $groff_cv_header_inttypes_h = no; then
- AC_REQUIRE([GROFF_UNSIGNED_LONG_LONG])
- test $groff_cv_type_unsigned_long_long = yes \
- && ac_type='unsigned long long' \
- || ac_type='unsigned long'
- AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
- [Define uintmax_t to `unsigned long' or `unsigned long long' if
- <inttypes.h> does not exist.])
- fi])
-
-# Identify PATH_SEPARATOR character to use in GROFF_FONT_PATH and
-# GROFF_TMAC_PATH which is appropriate for the target system (POSIX=':',
-# MS-DOS/Win32=';').
-#
-# The logic to resolve this test is already encapsulated in
-# `${srcdir}/src/include/nonposix.h'.
-
-AC_DEFUN([GROFF_TARGET_PATH_SEPARATOR],
- [AC_MSG_CHECKING([separator character to use in groff search paths])
- cp ${srcdir}/src/include/nonposix.h conftest.h
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <ctype.h>
-#include "conftest.h"
-
- ]],
- [[
-
-#if PATH_SEP_CHAR == ';'
-make an error "Path separator is ';'"
-#endif
-
- ]])
- ],
- [GROFF_PATH_SEPARATOR=":"],
- [GROFF_PATH_SEPARATOR=";"])
- AC_MSG_RESULT([$GROFF_PATH_SEPARATOR])
- AC_SUBST(GROFF_PATH_SEPARATOR)])
-
-# Check for X11.
-
-AC_DEFUN([GROFF_X11],
- [AC_REQUIRE([AC_PATH_XTRA])
- groff_no_x=$no_x
- if test -z "$groff_no_x"; then
- OLDCFLAGS=$CFLAGS
- OLDLDFLAGS=$LDFLAGS
- OLDLIBS=$LIBS
- CFLAGS="$CFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_LIBS"
- LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-
- LIBS="$LIBS -lXaw"
- AC_MSG_CHECKING([for Xaw library and header files])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <X11/Intrinsic.h>
-#include <X11/Xaw/Simple.h>
-
- ]],
- [])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- groff_no_x="yes"])
-
- LIBS="$LIBS -lXmu"
- AC_MSG_CHECKING([for Xmu library and header files])
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
-
-#include <X11/Intrinsic.h>
-#include <X11/Xmu/Converters.h>
-
- ]],
- [])
- ],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- groff_no_x="yes"])
-
- CFLAGS=$OLDCFLAGS
- LDFLAGS=$OLDLDFLAGS
- LIBS=$OLDLIBS
- fi
-
- if test "x$groff_no_x" = "xyes"; then
- AC_MSG_NOTICE([gxditview and xtotroff won't be built])
- else
- XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
- XPROGDIRS="src/devices/xditview src/utils/xtotroff"
- XLIBDIRS="src/libs/libxutil"
- fi
-
- AC_SUBST([XDEVDIRS])
- AC_SUBST([XPROGDIRS])
- AC_SUBST([XLIBDIRS])])
-
-# Set up the `--with-appresdir' command line option.
-
-AC_DEFUN([GROFF_APPRESDIR_OPTION],
- [AC_ARG_WITH([appresdir],
- dnl Don't quote AS_HELP_STRING!
- AS_HELP_STRING([--with-appresdir=DIR],
- [X11 application resource files]))])
-
-# Get a default value for the application resource directory.
-#
-# We ignore the `XAPPLRES' and `XUSERFILESEARCHPATH' environment variables.
-#
-# The goal is to find the `root' of X11. Under most systems this is
-# `/usr/X11/lib'. Application default files are then in
-# `/usr/X11/lib/X11/app-defaults'.
-#
-# Based on autoconf's AC_PATH_X macro.
-
-AC_DEFUN([GROFF_APPRESDIR_DEFAULT],
- [if test -z "$groff_no_x"; then
- # Create an Imakefile, run `xmkmf', then `make'.
- rm -f -r conftest.dir
- if mkdir conftest.dir; then
- cd conftest.dir
- # Make sure to not put `make' in the Imakefile rules,
- # since we grep it out.
- cat >Imakefile <<'EOF'
-
-xlibdirs:
- @echo 'groff_x_usrlibdir="${USRLIBDIR}"; groff_x_libdir="${LIBDIR}"'
-EOF
-
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...",
- # which would confuse us.
- eval `${MAKE-make} xlibdirs 2>/dev/null | grep -v make`
-
- # Open Windows `xmkmf' reportedly sets LIBDIR instead of USRLIBDIR.
- for groff_extension in a so sl; do
- if test ! -f $groff_x_usrlibdir/libX11.$groff_extension &&
- test -f $groff_x_libdir/libX11.$groff_extension; then
- groff_x_usrlibdir=$groff_x_libdir
- break
- fi
- done
- fi
-
- cd ..
- rm -f -r conftest.dir
- fi
-
- # In case the test with `xmkmf' wasn't successful, try a suite of
- # standard directories. Check `X11' before `X11Rn' because it is often
- # a symlink to the current release.
- groff_x_libdirs='
- /usr/X11/lib
- /usr/X11R6/lib
- /usr/X11R5/lib
- /usr/X11R4/lib
-
- /usr/lib/X11
- /usr/lib/X11R6
- /usr/lib/X11R5
- /usr/lib/X11R4
-
- /usr/local/X11/lib
- /usr/local/X11R6/lib
- /usr/local/X11R5/lib
- /usr/local/X11R4/lib
-
- /usr/local/lib/X11
- /usr/local/lib/X11R6
- /usr/local/lib/X11R5
- /usr/local/lib/X11R4
-
- /usr/X386/lib
- /usr/x386/lib
- /usr/XFree86/lib/X11
-
- /usr/lib
- /usr/local/lib
- /usr/unsupported/lib
- /usr/athena/lib
- /usr/local/x11r5/lib
- /usr/lpp/Xamples/lib
-
- /usr/openwin/lib
- /usr/openwin/share/lib'
-
- if test -z "$groff_x_usrlibdir"; then
- # We only test whether libX11 exists.
- for groff_dir in $groff_x_libdirs; do
- for groff_extension in a so sl; do
- if test ! -r $groff_dir/libX11.$groff_extension; then
- groff_x_usrlibdir=$groff_dir
- break 2
- fi
- done
- done
- fi
-
- if test "x$with_appresdir" = "x"; then
- appresdir=$groff_x_usrlibdir/X11/app-defaults
- else
- appresdir=$with_appresdir
- fi
- fi
- AC_SUBST([appresdir])])
-
-
-# Emit warning if --with-appresdir hasn't been used.
-
-AC_DEFUN([GROFF_APPRESDIR_CHECK],
- [if test -z "$groff_no_x"; then
- if test "x$with_appresdir" = "x"; then
- AC_MSG_NOTICE([
-
- The application resource file for gxditview will be installed as
-
- $appresdir/GXditview
-
- (an existing file will be saved as `GXditview.old').
- To install it into a different directory, say, `/etc/gxditview',
- add `--with-appresdir=/etc/gxditview' to the configure script
- command line options and rerun it. The environment variable
- `APPLRESDIR' must then be set to `/etc/' (note the trailing slash),
- omitting the `gxditview' part which is automatically appended by
- the X11 searching routines for resource files. More details can be
- found in the X(7) manual page.
- ])
- fi
- fi])
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_include([m4/codeset.m4])
+m4_include([m4/groff.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
Index: groff/configure
diff -u groff/configure:1.73 groff/configure:1.74
--- groff/configure:1.73 Sat Dec 31 08:26:57 2005
+++ groff/configure Tue Jan 3 23:57:03 2006
@@ -540,7 +540,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS
OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS
XLIBDIRS appresdir LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC MAKEINFO RANLIB
ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S
SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g
sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR ALT_GHOSTSCRIPT_PROGS
GHOSTSCRIPT ac_ct_GHOSTSCRIPT pnmcut pnmcrop pnmtopng psselect pnmtops
make_html make_install_html ALT_AWK_PROGS AWK ac_ct_AWK make_pdfdoc
make_install_pdfdoc pnmtops_nosetpage LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS
OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS
XLIBDIRS appresdir LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC MAKEINFO RANLIB
ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S
SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM build build_cpu build_vendor build_os
host host_cpu host_vendor host_os LIBICONV LTLIBICONV LIBOBJS
BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR
ALT_GHOSTSCRIPT_PROGS GHOSTSCRIPT ac_ct_GHOSTSCRIPT pnmcut pnmcrop pnmtopng
psselect pnmtops make_html make_install_html ALT_AWK_PROGS AWK ac_ct_AWK
make_pdfdoc make_install_pdfdoc pnmtops_nosetpage LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1076,6 +1076,10 @@
X features:
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF
fi
@@ -1083,11 +1087,19 @@
cat <<\_ACEOF
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-rpath do not hardcode runtime library paths
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-x use the X Window System
--with-appresdir=DIR X11 application resource files
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and
libdir
--with-alt-gs=LIST alternative names for ghostscript executable
--with-gs=PROG actual [/path/]name of ghostscript executable
--with-alt-awk=LIST alternative names for awk executable
@@ -8898,6 +8910,869 @@
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify
one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed"
>&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+ ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi;
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${acl_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in
\$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+ echo "$as_me:$LINENO: checking
for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld"
\
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+ :
+else
+ enable_rpath=yes
+fi;
+
+
+ acl_libdirstem=lib
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e
's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
+
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+
+fi;
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e
'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+
}$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext";
then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir
-l$name"
+ if test "X$found_so" != "X"; then
+ if test
"$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+
haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test
"$hardcode_minus_L" = no; then
+
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+
haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
"s,/$acl_libdirstem/"'*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+
if test "X$additional_includedir" !=
"X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+
}-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+
if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ if test "X$additional_libdir" =
"X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+
LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round
"`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e
's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+
}$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_func_iconv=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6
+ if test "$am_cv_func_iconv" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV 1
+_ACEOF
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+ if test "$am_cv_func_iconv" = yes; then
+ echo "$as_me:$LINENO: checking for iconv declaration" >&5
+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
+ if test "${am_cv_proto_iconv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf,
size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_proto_iconv_arg1=""
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+am_cv_proto_iconv_arg1="const"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd,
$am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf,
size_t *outbytesleft);"
+fi
+
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/(
/(/'`
+ echo "$as_me:$LINENO: result: ${ac_t:-
+ }$am_cv_proto_iconv" >&5
+echo "${ECHO_T}${ac_t:-
+ }$am_cv_proto_iconv" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_ACEOF
+
+ fi
+
+
# checks for functions
@@ -9830,6 +10705,70 @@
+ echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+if test "${am_cv_langinfo_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_langinfo_codeset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+am_cv_langinfo_codeset=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test $am_cv_langinfo_codeset = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LANGINFO_CODESET 1
+_ACEOF
+
+ fi
+
+
# checks for compiler characteristics
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11434,6 +12373,16 @@
s,@EGREP@,$EGREP,;t t
s,@LIBC@,$LIBC,;t t
s,@LIBM@,$LIBM,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@LIBICONV@,$LIBICONV,;t t
+s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@BROKEN_SPOOLER_FLAGS@,$BROKEN_SPOOLER_FLAGS,;t t
s,@PAGE@,$PAGE,;t t
Index: groff/configure.ac
diff -u groff/configure.ac:1.37 groff/configure.ac:1.38
--- groff/configure.ac:1.37 Sat Dec 31 08:26:57 2005
+++ groff/configure.ac Tue Jan 3 23:57:03 2006
@@ -89,6 +89,7 @@
# checks for libraries
GROFF_LIBC
GROFF_LIBM
+AM_ICONV
# checks for functions
AC_FUNC_MMAP
@@ -102,6 +103,7 @@
AC_CHECK_FUNCS([gettimeofday isatty kill rename setlocale strsep])
GROFF_MKSTEMP
AC_CHECK_DECLS([sys_siglist])
+AM_LANGINFO_CODESET
# checks for compiler characteristics
GROFF_ARRAY_DELETE
Index: groff/doc/Makefile.in
diff -u groff/doc/Makefile.in:1.20 groff/doc/Makefile.in:1.21
--- groff/doc/Makefile.in:1.20 Mon Nov 28 08:40:23 2005
+++ groff/doc/Makefile.in Tue Jan 3 23:57:03 2006
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Written by Werner Lemberg <address@hidden>
#
# This file is part of groff.
@@ -128,8 +128,8 @@
webpage.html: webpage.ms gnu.png gnu.eps groff.css
$(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
- -P-n -P-r -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -Thtml -ms >$@
+ -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
+ -P-D$(imagedir) -Thtml -ms >$@
webpage.ps: gnu.eps
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.23 groff/doc/Makefile.sub:1.24
--- groff/doc/Makefile.sub:1.23 Fri Nov 18 21:12:56 2005
+++ groff/doc/Makefile.sub Tue Jan 3 23:57:03 2006
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Written by Werner Lemberg <address@hidden>
#
# This file is part of groff.
@@ -153,6 +153,10 @@
-Thtml -ms >$@
webpage.html: webpage.ms gnu.png groff.css
+ $(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
+ -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
+ -P-D$(imagedir) -Thtml -ms >$@
+
webpage.ps: gnu.eps
grnexmpl.ps: grnexmpl.me grnexmpl.g
Index: groff/doc/webpage.ms
diff -u groff/doc/webpage.ms:1.21 groff/doc/webpage.ms:1.22
--- groff/doc/webpage.ms:1.21 Mon Nov 28 08:40:23 2005
+++ groff/doc/webpage.ms Tue Jan 3 23:57:03 2006
@@ -51,8 +51,10 @@
.DC T HIS mydarkred
is the home page for groff (\c
.URL http://\:www.gnu.org/ GNU
-Troff). Groff is a software typesetting package which reads plain
-text mixed with formatting commands and produces formatted output.
+Troff).
+.
+Groff is a software typesetting package which reads plain text mixed with
+formatting commands and produces formatted output.
.
The source code of the currently released versions of groff is
available at the
@@ -91,7 +93,9 @@
The image at the top has been contributed by Imogen Mulley (born 1991),
based on a similar picture found on the
.URL http://www.gnu.org "GNU server" .
+.
.HR
+.
.SH
Licence
.LP
@@ -144,13 +148,13 @@
.nf
.ft C
cd ~/cvswork
-CVS_RSH=ssh; export CVS_RSH
-cvs -d:ext:address@hidden/cvsroot/groff -z5 co groff
+cvs -d:pserver:address@hidden:/cvsroot/groff login
+cvs -d:pserver:address@hidden:/cvsroot/groff -z5 co groff
.ft P
.fi
.in
-(Note that you need an SSH client for security reasons.)
+When asked for a password during the `login' call, simply press Enter.
This will create a subdirectory, ~/cvswork/groff, with a `checked out'
copy of the CVS repository.
@@ -161,7 +165,7 @@
.nf
.ft C
cd ~/cvswork/groff
-CVS_RSH=ssh cvs -z5 update -dP
+cvs -z5 update -dP
.ft P
.fi
.in
@@ -258,8 +262,9 @@
a read-only list showing commitments to the CVS repository
.ULE
-You can post mails directly to the `bug-groff' list, without subscribing;
-to post mails to the `groff' list you must subscribe to it.
+You can post mails directly to the `bug-groff' list, without subscribing
+(this fact makes the list contain many spam files); to post mails to the
+`groff' list you must subscribe to it.
To subscribe, send e-mail to address@hidden
(example:
@@ -282,7 +287,8 @@
.SH
NEWS VERSION 1.19.2
.LP
-.SH 2 troff
+.SH 2
+troff
.ULS
.LI
Index: groff/src/include/config.hin
diff -u groff/src/include/config.hin:1.13 groff/src/include/config.hin:1.14
--- groff/src/include/config.hin:1.13 Sat Dec 31 08:26:57 2005
+++ groff/src/include/config.hin Tue Jan 3 23:57:03 2006
@@ -34,6 +34,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -43,6 +46,9 @@
/* Define to 1 if you have the `kill' function. */
#undef HAVE_KILL
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -127,6 +133,9 @@
/* Define to 1 if you have the `vsnprintf' function. */
#undef HAVE_VSNPRINTF
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
/* Define if the host's encoding is EBCDIC. */
#undef IS_EBCDIC_HOST
Index: groff/src/preproc/preconv/Makefile.sub
diff -u groff/src/preproc/preconv/Makefile.sub:1.1
groff/src/preproc/preconv/Makefile.sub:1.2
--- groff/src/preproc/preconv/Makefile.sub:1.1 Fri Dec 30 09:31:50 2005
+++ groff/src/preproc/preconv/Makefile.sub Tue Jan 3 23:57:03 2006
@@ -2,5 +2,6 @@
# MAN1=preconv.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
+EXTRA_LDFLAGS=$(LIBICONV)
OBJS=preconv.$(OBJEXT)
CCSRCS=$(srcdir)/preconv.cpp
Index: groff/src/preproc/preconv/preconv.cpp
diff -u groff/src/preproc/preconv/preconv.cpp:1.3
groff/src/preproc/preconv/preconv.cpp:1.4
--- groff/src/preproc/preconv/preconv.cpp:1.3 Sun Jan 1 18:20:21 2006
+++ groff/src/preproc/preconv/preconv.cpp Tue Jan 3 23:57:03 2006
@@ -19,8 +19,6 @@
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
-#define I18N
-
#include "lib.h"
#include <assert.h>
@@ -31,16 +29,20 @@
#include "nonposix.h"
#include "stringclass.h"
-#ifdef I18N
-# include <locale.h>
+#include <locale.h>
+
+#if HAVE_LANGINFO_CODESET
# include <langinfo.h>
+#endif
+
+#if HAVE_ICONV
# include <iconv.h>
# ifdef WORDS_BIGENDIAN
# define UNICODE "UTF-32BE"
# else
# define UNICODE "UTF-32LE"
# endif
-#endif /* I18N */
+#endif
#define MAX_VAR_LEN 100
@@ -589,7 +591,7 @@
}
// Locale-sensible conversion.
-#ifdef I18N
+#if HAVE_ICONV
void
conversion_iconv(FILE *fp, const string &data, char *enc)
{
@@ -673,7 +675,7 @@
for (int *ptr = outbuf; (char *)ptr < limit; ptr++)
unicode_entity(*ptr);
}
-#endif /* I18N */
+#endif /* HAVE_ICONV */
// ---------------------------------------------------------
// Handle Byte Order Mark.
@@ -985,7 +987,7 @@
else if (!strcasecmp(encoding, "cp1047"))
conversion_cp1047(fp, data);
else {
-#ifdef I18N
+#if HAVE_ICONV
conversion_iconv(fp, data, encoding);
#else
error("encoding system `%1' not supported", encoding);
@@ -1023,8 +1025,8 @@
// Determine the default encoding. This must be done before
// getopt() is called since the usage message shows the default
// encoding.
-#ifdef I18N
setlocale(LC_ALL, "");
+#if HAVE_LANGINFO_CODESET
char *locale = setlocale(LC_CTYPE, NULL);
if (!locale || !strcmp(locale, "C") || !strcmp(locale, "POSIX"))
default_encoding = "latin1";
@@ -1035,7 +1037,7 @@
}
#else
default_encoding = "latin1";
-#endif /* I18N */
+#endif /* HAVE_LANGINFO_CODESET */
program_name = argv[0];
int opt;
Index: groff/tmac/groff_www.man
diff -u groff/tmac/groff_www.man:1.17 groff/tmac/groff_www.man:1.18
--- groff/tmac/groff_www.man:1.17 Mon Nov 28 08:40:23 2005
+++ groff/tmac/groff_www.man Tue Jan 3 23:57:03 2006
@@ -1,5 +1,5 @@
.TH GROFF_WWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.\" Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+.\" Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
.\" Free Software Foundation, Inc.
.\" Written by Gaius Mulley (address@hidden)
.\"
@@ -52,7 +52,7 @@
has been completely rewritten but still remains as in an alpha state.
It has been included into the distribution so that a lot of people have a
chance to test it.
-Note that this macro file will be automatically called (via the
+Note that this macro file is automatically called (via the
.B troffrc
file) if you use
.BR \-Thtml .
@@ -99,9 +99,9 @@
\&.CDE code example end
\&.ALN place links on left of
main text.
-\&.LNS start a new two column
+\&.LNS start a new two-column
table with links in the left.
-\&.LNE end the two column table.
+\&.LNE end the two-column table.
.fi
.PP
Output of the
@@ -142,7 +142,7 @@
.fi
.RE
.IP
-will tell
+tells
.B \%grohtml
that no heading links should be created at all.
Another method for turning automatic headings off is by issuing the
@@ -487,30 +487,31 @@
.
.TP
.B ".ALN [color] [percentage]"
-Place section heading links automatically to the left of the main
-text. The color argument is optional and if present indicates which
-HTML background color is to be used under the links.
+Place section heading links automatically to the left of the main text.
+The color argument is optional and if present indicates which HTML
+background color is to be used under the links.
The optional percentage indicates the amount of width to devote to
-displaying the links. The default values are #eeeeee and 30
-for color and percentage width respectively.
+displaying the links.
+The default values are #eeeeee and 30 for color and percentage width,
+respectively.
This macro should only be called once at the beginning of the document.
-Once this macro has been called each section heading will emit an
-HTML table consisting of the links in the left and the section text
-on the right.
+After calling this macro each section heading emits an HTML table consisting
+of the links in the left and the section text on the right.
.
.TP
.B ".LNS"
-Start a new two column table with links in the left column.
-This can be called if the document has text before the first .SH
-and if .ALN is used. Typically this is called just before the
-first paragraph and after the main title as it indicates that
-text after this point should be positioned to the right of
-the left hand navigational links.
+Start a new two-column table with links in the left column.
+This can be called if the document has text before the first .SH and if .ALN
+is used.
+Typically this is called just before the first paragraph and after the main
+title as it indicates that text after this point should be positioned to the
+right of the left-hand navigational links.
.
.TP
.B ".LNE"
-End a two column table. This should be called at the end of the
-document if .ALN was used.
+End a two-column table.
+This should be called at the end of the document if .ALN was used.
+.
.
.SH SECTION HEADING LINKS
By default
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.44 groff/tmac/www.tmac:1.45
--- groff/tmac/www.tmac:1.44 Mon Nov 28 08:40:23 2005
+++ groff/tmac/www.tmac Tue Jan 3 23:57:03 2006
@@ -38,6 +38,7 @@
www functionality. It should work with any macro set.
..
.
+.
.\" --------------------------------------------------------------------
.\" Setup
.\" --------------------------------------------------------------------
@@ -119,7 +120,6 @@
. el .sp \\n[www:pd]u
..
.
-.\"
.\" --------------------------------------------------------------------
.\" www:error (<test>...)
.\"
@@ -145,6 +145,7 @@
. nr \\$1 (\\n[\\$0:n]-1)
. rr \\$0:n
..
+.
.\" --------------------------------------------------------------------
.\" www:splitstr (<name>)
.\"
@@ -180,6 +181,7 @@
. rm \\$0:r
. rm \\$0:s
..
+.
.\" --------------------------------------------------------------------
.\" www:url_breaks (<string_name>)
.\"
@@ -200,6 +202,7 @@
. ds \\$1 "\\*[\\$0:s]\""
. rm \\$0:s
..
+.
.\" --------------------------------------------------------------------
.\" www:url_breaks_splitted (<result> <char> [<char>...])
.\"
@@ -256,6 +259,8 @@
. rm \\$0:res
. rm \\$0:s
..
+.
+.
.\" --------------------------------------------------------------------
.\" User Interface
.\" --------------------------------------------------------------------
@@ -277,12 +282,14 @@
. nop \&
. \}
..
+.
.\"
.\" an auxiliary macro for HTML (without following space)
.\"
.de HTML-NS
. nop \X^html:\\$*^\c
..
+.
.\"
.\" emit a HTML tag after shutting down a (possibly open) paragraph
.\"
@@ -292,6 +299,7 @@
. nop \&\X^html</p>:\\$*^
. \}
..
+.
.\" --------------------------------------------------------------------
.\" HX n
.\"
@@ -305,18 +313,21 @@
. if \\n[www-html] \
. nop \X^index:\\$*^
..
+.
.\" --------------------------------------------------------------------
.\" BCL foreground background active not-visited visited
.\"
.de BCL
. HTML <body text=\\$1 bgcolor=\\$2 link=\\$3 alink=\\$4 vlink=\\$5>
..
+.
.\" --------------------------------------------------------------------
.\" BGIMG imagefile
.\"
.de BGIMG
. HTML <body background=\\$1>
..
+.
.\" --------------------------------------------------------------------
.\" URL url [description] [after]
.\" if description is absent then the url becomes the anchor text
@@ -370,12 +381,14 @@
. \}
. rm \\$0:adr
..
+.
.\" --------------------------------------------------------------------
.\" FTP url description [after]
.\"
.\" Same as URL.
.\"
.als FTP URL
+.
.\" --------------------------------------------------------------------
.\" MTO address description [after]
.\"
@@ -428,6 +441,7 @@
. \}
. \}
..
+.
.\" --------------------------------------------------------------------
.\" TAG name
.\"
@@ -436,6 +450,7 @@
.de TAG
. HTML <a name="\\$1"></a>
..
+.
.\" --------------------------------------------------------------------
.\" IMG [-R|-L|-C] filename [width] [height]
.\"
@@ -467,6 +482,7 @@
. el \
. nop \[la]\f[C]\\$1\f[]\[ra]
..
+.
.\" --------------------------------------------------------------------
.\" PIMG [-R|-L|-C] filename [width] [height]
.\"
@@ -577,7 +593,7 @@
.\" N1 - name of number register 1=absolute 0=percentage
.\" N2 - number register name for absolute value
.\" S1 - string register name for percentage value
-.
+.\"
.de www-handle-percent
. ds www-percent \\$1\"
. substring www-percent -1 -1
@@ -612,7 +628,6 @@
.\" activating unsafe mode, if not used with -Thtml; the PNG image
.\" is then converted to the EPS format using netpbm utilities.
.\"
-.
.nr www-htmlimage-gap 0
.
.de MPIMG
@@ -751,6 +766,7 @@
. \}
. \}
..
+.
.\" --------------------------------------------------------------------
.\" HnS n
.\"
@@ -779,6 +795,7 @@
. www-error "HnE found without a corresponding HnS"
. DEVTAG-EO-H
..
+.
.\" --------------------------------------------------------------------
.\" LK
.\"
@@ -788,6 +805,7 @@
.de LK
. DEVTAG ".links"
..
+.
.\" --------------------------------------------------------------------
.\" HR
.\"
@@ -796,6 +814,7 @@
.de HR
. HTML</p> "<hr>"
..
+.
.\" --------------------------------------------------------------------
.\" NHR
.\"
@@ -805,6 +824,7 @@
.de NHR
. DEVTAG ".no-auto-rule"
..
+.
.\"
.\" www-end-nowhere - end of input trap called to finish diversion.
.\"
@@ -813,6 +833,7 @@
. di
. DEVTAG-EO-TL
..
+.
.\" --------------------------------------------------------------------
.\" HTL
.\"
@@ -906,6 +927,7 @@
. if (\\n[www-ol-level] > 3) \
. www-error "OLS: too many levels of indentation (\\n[www-ol-level])"
..
+.
.\"
.\" Auxiliary macro for OLE.
.\"
@@ -929,6 +951,7 @@
. nr www-li-indent +\w'\\*[www-ul-level\\n[www-ul-level]]'u
. \}
..
+.
.\" --------------------------------------------------------------------
.\" ULE
.\"
@@ -944,6 +967,7 @@
. www-pop-ul-level
. www-pop-li
..
+.
.\" --------------------------------------------------------------------
.\" OLS
.\"
@@ -957,6 +981,7 @@
. el \
. nr www-li-indent +\w'\\*[www-ol-tmp]'u
..
+.
.\" --------------------------------------------------------------------
.\" OLE
.\"
@@ -973,6 +998,7 @@
. www-pop-ol-level
. www-pop-li
..
+.
.\" --------------------------------------------------------------------
.\"
.\" DLS
@@ -988,6 +1014,7 @@
. in \\n[www-li-indent]u
. \}
..
+.
.\" --------------------------------------------------------------------
.\"
.\" DLE
@@ -1003,6 +1030,7 @@
. nr www-dl-level -1
. www-pop-li
..
+.
.\" --------------------------------------------------------------------
.\" LI
.\"
@@ -1021,6 +1049,7 @@
. nop \\*[www-ul-level\\n[www-ul-level]]\c
. \}
..
+.
.\" ********
.\" www-li-ol - numbered list item
.\"
@@ -1034,6 +1063,7 @@
. nop \\n+[www-ol-ctr\\n[www-ol-level]]\ \ \c
. \}
..
+.
.\" ********
.\" www-li-dl - definition list item
.\"
@@ -1050,6 +1080,7 @@
. br
. \}
..
+.
.\" --------------------------------------------------------------------
.\" DC l text [color]
.\"
@@ -1064,7 +1095,7 @@
. ds www-dropcolor black
. if !'\\$3'' \
. ds www-dropcolor \\$3
-. ie '\*(.T'html' \{\
+. ie '\*[.T]'html' \{\
. www-make-unique-name
. nr www-drop-width (100u * \\n[.v]u * 3u / \\n[.l]u)
. MPIMG -L \\*[www-unique-name].png "\\n[www-drop-width]%"
@@ -1100,6 +1131,7 @@
. \}
. nop \\$2
..
+.
.\" --------------------------------------------------------------------
.\" Setup around HTML-IMAGE and friends
.\"
@@ -1109,6 +1141,7 @@
.do if !d TE .do ds TE HTML-IMAGE-END
.do if !d EQ .do ds EQ HTML-IMAGE
.do if !d EN .do ds EN HTML-IMAGE-END
+.
.\"
.\" supplementary macros used by other macro sets
.\"
@@ -1125,6 +1158,7 @@
. if \\n[www-html] \
. nop \O[5\\$2\\$1.png]\O[0]\O[3]
..
+.
.\" --------------------------------------------------------------------
.\" HTML-IMAGE-END - terminates an image for html
.\"
@@ -1145,6 +1179,7 @@
. nr www-png-no +1
. ds www-unique-name \\*[www-image-template]\\n[www-png-no]
..
+.
.\" --------------------------------------------------------------------
.\" HTML-IMAGE and friends tell grohtml that this region of text needs
.\" to be rendered as an image.
@@ -1180,6 +1215,7 @@
.de JOBNAME
. DEVTAG .job-name \\$1
..
+.
.\" --------------------------------------------------------------------
.\" HEAD
.\"
@@ -1189,103 +1225,115 @@
.de HEAD
. DEVTAG .head "\\$*"
..
-.\" --------------------------------------------------------------------
-.\" Final Setup
-.\" --------------------------------------------------------------------
-.
-.if \n[www-html] \{\
-. nh
-. nr HY 0
-.\}
.
-.\"
+.\" --------------------------------------------------------------------
.\" start of some code
.\"
-.
.de CDS
-.ft C
-.nf
+. ft C
+. nf
..
-.\"
+.
+.\" --------------------------------------------------------------------
.\" end of some code
.\"
-.
.de CDE
-.fi
-.ft P
+. fi
+. ft P
..
.
.ds www-nav-colour "#eeeeee
.nr www-nav-width-left 30
.nr www-nav-width-right 70
.
-.
+.\" --------------------------------------------------------------------
.\" LNS - left navigation start
-.
+.\"
.de LNS
-. HTML</p> "<table><tr><td valign=top width=\\n[www-nav-width-left]%
bgcolor=""\\*[www-nav-colour]"">"
-. LK
-. HTML</p> "</td><td valign=top width=\\n[www-nav-width-right]%>"
-. nr SH-open 1
+. HTML</p> "<table><tr><td valign=top \
+ width=\\n[www-nav-width-left]% \
+ bgcolor=""\\*[www-nav-colour]"">"
+. LK
+. HTML</p> "</td><td valign=top width=\\n[www-nav-width-right]%>"
+. nr SH-open 1
..
.
+.\" --------------------------------------------------------------------
.\" LNE - left navigation end
-.
+.\"
.de LNE
-. HTML</p> </td></tr></table>
-. HR
+. HTML</p> </td></tr></table>
+. HR
..
+.
.nr SH-open 0
.nr needs-begin 0
.
-.
+.\"
+.\" some auxiliary macros for left navigation lists
+.\"
.de www-SH
-. if (0\\$1 == 0) \{\
-. if (\\n[SH-open] == 1) .LNE
-. nr needs-begin 1
-. @SH-old
-. \}
+. if (0\\$1 == 0) \{\
+. if (\\n[SH-open] == 1) \
+. LNE
+. nr needs-begin 1
+. @SH-old
+. \}
..
.
.de www-NH
-. if (0\\$1 <= 1) \{\
-. if (\\n[SH-open] == 1) .LNE
-. nr needs-begin 1
-. @NH-old
-. \}
+. if (0\\$1 <= 1) \{\
+. if (\\n[SH-open] == 1) \
+. LNE
+. nr needs-begin 1
+. @NH-old
+. \}
..
.
.de www-LP
-. @LP-old
-. if (\\n[needs-begin] == 1) \{\
-. HR
-. LNS
-. \}
-. nr needs-begin 0
+. @LP-old
+. if (\\n[needs-begin] == 1) \{\
+. HR
+. LNS
+. \}
+. nr needs-begin 0
..
.
-.\" ALN [colour] [left width percentage]
-.\" turns on automatic left navigation, this macro should only be
-.\" called once (normally at the start of the document) as it
-.\" indicates the all top level section headings will form a
-.\" navigation list on the left of the main text.
-.
+.\" --------------------------------------------------------------------
+.\" ALN [colour] [left width percentage]
+.\"
+.\" Turn on automatic left navigation. This macro should only be
+.\" called once (normally at the start of the document) as it
+.\" indicates that all top-level section headings form a navigation
+.\" list on the left of the main text.
+.\"
.de ALN
-. if '\*(.T'html' \{\
-. if !'\\$1'' .ds www-nav-colour \\$1
-. if (0\\$2 > 0) \{\
-. nr www-nav-width-left \\$2
-. nr www-nav-width-right (100-\\$2)
-. \}
-. rn @SH @SH-old
-. rn www-SH @SH
-. rn @NH @NH-old
-. rn www-NH @NH
-. rn @LP @LP-old
-. rn www-LP @LP
-. \}
+. if '\*[.T]'html' \{\
+. if !'\\$1'' \
+. ds www-nav-colour \\$1
+. if (0\\$2 > 0) \{\
+. nr www-nav-width-left \\$2
+. nr www-nav-width-right (100 - \\$2)
+. \}
+. rn @SH @SH-old
+. rn www-SH @SH
+. rn @NH @NH-old
+. rn www-NH @NH
+. rn @LP @LP-old
+. rn www-LP @LP
+. \}
..
.
+.
+.\" --------------------------------------------------------------------
+.\" Final Setup
+.\" --------------------------------------------------------------------
+.
+.if \n[www-html] \{\
+. nh
+. nr HY 0
+.\}
+.
.if r ps4html .nop \O[0]
.cp \n(_C
.
- [Groff-commit] groff ./ChangeLog ./Makefile.in ./Makefile.sub ...,
Werner LEMBERG <=