[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog INSTALL Makefile.in NEWS ac...
|
From: |
Derek Robert Price |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog INSTALL Makefile.in NEWS ac... |
|
Date: |
Tue, 06 Jan 2009 00:35:30 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Derek Robert Price <dprice> 09/01/06 00:35:30
Modified files:
. : ChangeLog INSTALL Makefile.in NEWS aclocal.m4
config.guess config.sub configure configure.ac
install-sh missing mkinstalldirs texi2html.spec
translations.pl
Tests : Makefile.in
doc : Makefile.in mdate-sh stamp-vti texinfo.tex
version.texi
test : Makefile.in
test/contents : Makefile.in
test/coverage : Makefile.in
test/encodings : Makefile.in
test/formatting: Makefile.in
test/htmlxref : Makefile.in
test/htmlxref-only_mono: Makefile.in
test/htmlxref-only_split: Makefile.in
test/indices : Makefile.in
test/invalid : Makefile.in
test/layout : Makefile.in
test/macros : Makefile.in
test/manuals : Makefile.in
test/many_input_files: Makefile.in
test/misc : Makefile.in
test/nested_formats: Makefile.in
test/sectionning: Makefile.in
test/singular_manual: Makefile.in
test/tar_manual: Makefile.in
test/texi2html_manual: Makefile.in
test/xemacs_manual: Makefile.in
Log message:
* NEWS: Transform a few of Patrice's ChangeLog entries into what are
hopefully accurate NEWS entries for the 1.82 release.
* configure.ac: Update version # for 1.82 release.
* INSTALL, config.guess, config.sub, install-sh, missing,
mkinstalldirs, mdate-sh, doc/mdate-sh, doc/texinfo.tex: Updated from
versions in Automake 1.10.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.355&r2=1.356
http://cvs.savannah.gnu.org/viewcvs/texi2html/INSTALL?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.in?cvsroot=texi2html&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/texi2html/aclocal.m4?cvsroot=texi2html&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texi2html/config.guess?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/config.sub?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure?cvsroot=texi2html&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure.ac?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/install-sh?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/missing?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/mkinstalldirs?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.spec?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/translations.pl?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/Makefile.in?cvsroot=texi2html&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/Makefile.in?cvsroot=texi2html&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/mdate-sh?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/stamp-vti?cvsroot=texi2html&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texinfo.tex?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/version.texi?cvsroot=texi2html&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/Makefile.in?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/Makefile.in?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.in?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/htmlxref/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/htmlxref-only_mono/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/htmlxref-only_split/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/Makefile.in?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/Makefile.in?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.in?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/Makefile.in?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/many_input_files/Makefile.in?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/Makefile.in?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/singular_manual/Makefile.in?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/texi2html_manual/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/Makefile.in?cvsroot=texi2html&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -b -r1.355 -r1.356
--- ChangeLog 5 Jan 2009 11:44:48 -0000 1.355
+++ ChangeLog 6 Jan 2009 00:35:20 -0000 1.356
@@ -1,3 +1,12 @@
+2009-01-05 Derek Price <address@hidden>
+
+ * NEWS: Transform a few of Patrice's ChangeLog entries into what are
+ hopefully accurate NEWS entries for the 1.82 release.
+ * configure.ac: Update version # for 1.82 release.
+ * INSTALL, config.guess, config.sub, install-sh, missing,
+ mkinstalldirs, mdate-sh, doc/mdate-sh, doc/texinfo.tex: Updated from
+ versions in Automake 1.10.
+
2009-01-05 Patrice Dumas <address@hidden>
* texi2html.pl: don't duplicate the state for menu entry
Index: INSTALL
===================================================================
RCS file: /cvsroot/texi2html/texi2html/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- INSTALL 7 Jul 2005 21:44:55 -0000 1.2
+++ INSTALL 6 Jan 2009 00:35:22 -0000 1.3
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,31 +87,29 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +157,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -190,12 +188,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
Index: Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Makefile.in 2 Jan 2009 14:55:52 -0000 1.63
+++ Makefile.in 6 Jan 2009 00:35:24 -0000 1.64
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -172,7 +172,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = . doc Tests test
@@ -495,8 +494,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -521,8 +520,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -532,12 +531,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -607,10 +607,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -639,8 +635,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -798,19 +792,19 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am html-local \
- info info-am install install-am install-binSCRIPTS \
- install-data install-data-am install-dist_i18nDATA \
- install-dist_imagesDATA install-dist_pkgdataDATA install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
- tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am html-local info \
+ info-am install install-am install-binSCRIPTS install-data \
+ install-data-am install-dist_i18nDATA install-dist_imagesDATA \
+ install-dist_pkgdataDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-binSCRIPTS \
uninstall-dist_i18nDATA uninstall-dist_imagesDATA \
uninstall-dist_pkgdataDATA
Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- NEWS 4 Jan 2009 18:38:18 -0000 1.91
+++ NEWS 6 Jan 2009 00:35:25 -0000 1.92
@@ -1,6 +1,12 @@
This file records noteworthy changes.
-1.82 ()
+1.82 (2009-01-05)
+
+* NEW FEATURES
+ ------------
+
+* Add new hooks for user functions, for simple @-commands, and at the start and
+ end of special regions.
* BUG FIXES
---------
@@ -8,6 +14,12 @@
* Tests are now more cross-platform and more tolerant of missing optional
dependencies.
+* Don't use unidecode on unicode characters that are known not to have a good
+ transliteration. This corresponds with characters with an @-command that
+ don't have a transliteration, like @exclamdown...
+
+* Misc minor bug fixes.
+
1.80 (2009-01-01)
* NEW FEATURES
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/texi2html/texi2html/aclocal.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- aclocal.m4 2 Jan 2009 14:55:53 -0000 1.37
+++ aclocal.m4 6 Jan 2009 00:35:25 -0000 1.38
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 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.
@@ -11,15 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically
`autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -34,7 +31,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,10 +47,8 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -146,13 +141,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 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.
-# serial 13
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -257,17 +252,16 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -533,7 +527,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Index: config.guess
===================================================================
RCS file: /cvsroot/texi2html/texi2html/config.guess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config.guess 29 Dec 2004 15:37:40 -0000 1.1
+++ config.guess 6 Jan 2009 00:35:26 -0000 1.2
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2003-06-17'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <address@hidden>.
# Please send patches to <address@hidden>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -53,7 +56,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +69,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,7 +107,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) &&
exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15
;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp)
; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating
insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
;
@@ -123,7 +126,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (address@hidden 1994-08-24)
@@ -136,13 +139,6 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
- VENDOR=redhat ;
-else
- VENDOR= ;
-fi
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -203,50 +199,32 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
@@ -284,42 +262,49 @@
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# address@hidden (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -327,32 +312,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -361,10 +346,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}')
2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -376,10 +361,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -390,37 +375,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -444,32 +432,33 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -485,29 +474,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -515,7 +504,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -530,14 +519,18 @@
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk
'{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1;
then
@@ -551,28 +544,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -634,9 +627,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__
>/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -644,11 +647,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -676,150 +679,179 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ exit ;;
+ *:FreeBSD:*:*)
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed
-e 's/[-(].*//'` ;;
+ esac
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,'
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -836,8 +868,12 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -855,15 +891,22 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
- echo powerpc-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo powerpc-unknown-linux-gnu
+ exit ;;
ppc64:Linux:*:*)
- echo powerpc64-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -877,7 +920,7 @@
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -885,25 +928,28 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
- echo x86_64-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo x86_64-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -921,15 +967,15 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -946,23 +992,33 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C)
|| defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
#endif
#endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo
"${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -970,24 +1026,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -995,15 +1054,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo
${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1021,73 +1081,73 @@
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 |
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 |
SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 |
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 |
SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1095,68 +1155,72 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <address@hidden>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <address@hidden>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From address@hidden
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From address@hidden
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From address@hidden
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1164,22 +1228,25 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1190,28 +1257,47 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/
.*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1243,7 +1329,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1332,11 +1418,12 @@
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1345,22 +1432,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1371,7 +1458,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
Index: config.sub
===================================================================
RCS file: /cvsroot/texi2html/texi2html/config.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config.sub 29 Dec 2004 15:37:40 -0000 1.1
+++ config.sub 6 Jan 2009 00:35:26 -0000 1.2
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2003-06-18'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <address@hidden>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -70,7 +72,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -83,11 +85,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +101,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,7 +120,9 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* |
os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* |
netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -144,7 +148,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -169,6 +173,10 @@
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +240,17 @@
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr |
avr32 \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k \
- | m32r | m68000 | m68k | m88k | mcore \
+ | ip2k | iq2000 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -244,28 +259,33 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | s390 | s390x \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le |
sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle |
sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 |
sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -276,6 +296,9 @@
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -295,20 +318,20 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
- | bs2000-* \
+ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \
- | m32r-* \
+ | ip2k-* | iq2000-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -317,31 +340,36 @@
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | s390-* | s390x-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* |
shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* |
sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-*
| sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -361,6 +389,9 @@
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -378,6 +409,9 @@
amd64)
basic_machine=x86_64-pc
;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -437,12 +471,27 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -465,6 +514,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -643,10 +696,6 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e
's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -659,6 +708,9 @@
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -727,10 +779,6 @@
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -738,9 +786,12 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
@@ -767,6 +818,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -823,6 +880,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -833,6 +894,12 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
@@ -843,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -956,6 +1027,10 @@
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -999,6 +1074,10 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1029,6 +1108,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1045,13 +1127,10 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1124,19 +1203,23 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix*
\
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* |
-oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1154,12 +1237,15 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku*
\
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1172,6 +1258,9 @@
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1193,6 +1282,9 @@
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1215,6 +1307,9 @@
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1251,6 +1346,9 @@
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
@@ -1273,6 +1371,12 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1328,9 +1432,15 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1463,9 +1573,15 @@
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@@ -1490,7 +1606,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Index: configure
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- configure 2 Jan 2009 14:55:53 -0000 1.56
+++ configure 6 Jan 2009 00:35:26 -0000 1.57
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for texi2html 1.81.
+# Generated by GNU Autoconf 2.61 for texi2html 1.82.
#
# Report bugs to <address@hidden>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -17,7 +17,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -39,45 +39,17 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo";
then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ 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
# Support unset when possible.
@@ -93,6 +65,8 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -115,7 +89,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file
name" >&2
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file
name" >&2
{ (exit 1); exit 1; }
fi
@@ -128,10 +102,17 @@
PS4='+ '
# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+done
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -153,7 +134,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -261,7 +242,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -282,7 +263,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -434,10 +415,9 @@
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell address@hidden about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
+ echo Please tell address@hidden about your system,
+ echo including any error possibly output before this
+ echo message
}
@@ -473,7 +453,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX
shell" >&2
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX
shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -501,6 +481,7 @@
*)
ECHO_N='-n';;
esac
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -513,10 +494,10 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
+ mkdir conf$$.dir
fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
@@ -524,11 +505,8 @@
# In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
+elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
else
as_ln_s='cp -p'
fi
@@ -596,98 +574,89 @@
# Identity of this package.
PACKAGE_NAME='texi2html'
PACKAGE_TARNAME='texi2html'
-PACKAGE_VERSION='1.81'
-PACKAGE_STRING='texi2html 1.81'
+PACKAGE_VERSION='1.82'
+PACKAGE_STRING='texi2html 1.82'
PACKAGE_BUGREPORT='address@hidden'
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-REQUIRE_DATA_DUMPER
-USE_DATA_DUMPER
-USE_UNIDECODE
-USE_UNICODE
-PERL
-PACKAGE_DATE
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
+ac_subst_vars='SHELL
PATH_SEPARATOR
-SHELL'
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+PACKAGE_DATE
+PERL
+USE_UNICODE
+USE_UNIDECODE
+USE_DATA_DUMPER
+REQUIRE_DATA_DUMPER
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+LIBOBJS
+LTLIBOBJS'
ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-with_encode
-with_unidecode
-enable_translations
-enable_multiplatform
-'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -697,8 +666,6 @@
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -797,21 +764,13 @@
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *)
ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -824,21 +783,13 @@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *)
ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1029,38 +980,22 @@
ac_init_version=: ;;
-with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *)
ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *)
ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -1080,7 +1015,7 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1089,16 +1024,16 @@
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option}
${target_alias=$ac_option}
;;
@@ -1107,38 +1042,22 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+ { echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options:
$ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
- *) $as_echo "$as_me: WARNING: unrecognized options:
$ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
+# Be sure to have absolute directory names.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for
--$ac_var: $ac_val" >&2
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var:
$ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1153,7 +1072,7 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't
use --host.
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use
--host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1169,10 +1088,10 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
+ { echo "$as_me: error: Working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1180,12 +1099,12 @@
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_myself" : 'X\(//\)[^/]' \| \
- X"$as_myself" : 'X\(//\)$' \| \
- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+ ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1212,12 +1131,12 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir"
>&2
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me:
error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error:
$ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1244,7 +1163,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures texi2html 1.81 to adapt to many kinds of systems.
+\`configure' configures texi2html 1.82 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1314,12 +1233,11 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of texi2html 1.81:";;
+ short | recursive ) echo "Configuration of texi2html 1.82:";;
esac
cat <<\_ACEOF
Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
@@ -1347,17 +1265,15 @@
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
+ test -d "$ac_dir" || continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed
's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1393,7 +1309,7 @@
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir"
>&2
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1402,11 +1318,11 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-texi2html configure 1.81
-generated by GNU Autoconf 2.63
+texi2html configure 1.82
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1416,8 +1332,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by texi2html $as_me 1.81, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+It was created by texi2html $as_me 1.82, which was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1453,7 +1369,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
+ echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1488,7 +1404,7 @@
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1540,12 +1456,11 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var
contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains
a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1575,9 +1490,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed
"s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1592,9 +1507,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed
"s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1610,8 +1525,8 @@
echo
fi
test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1653,24 +1568,21 @@
# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
+# Prefer explicitly selected file to automatically selected ones.
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ set x "$CONFIG_SITE"
elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+shift
+for ac_site_file
do
- test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1680,16 +1592,16 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1703,38 +1615,29 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val'
in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous
run" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in
the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run"
>&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the
previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous
run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- # differences in whitespace do not lead to failure.
- ac_old_val_w=`echo x $ac_old_val`
- ac_new_val_w=`echo x $ac_new_val`
- if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the
previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the
previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
- else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in
\`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the
previous run:" >&2;}
- eval $ac_var=\$ac_old_val
- fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1744,12 +1647,10 @@
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise
the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build"
>&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm
$cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and
start over" >&2;}
+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the
build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm
$cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start
over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1803,8 +1704,8 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in
\"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\"
\"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in
\"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\"
\"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1830,12 +1731,11 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -1864,29 +1764,17 @@
# program-specific install script used by HP pwplus--don't use.
:
else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two
"`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
break 3
fi
fi
- fi
done
done
;;
esac
-
done
IFS=$as_save_IFS
-rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -1899,8 +1787,8 @@
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -1910,8 +1798,8 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -1934,9 +1822,9 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure
there is not a broken
+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there
is not a broken
alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a
broken
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1947,23 +1835,26 @@
# Ok.
:
else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than
distributed files!
+ { { echo "$as_me:$LINENO: error: newly created file is older than
distributed files!
Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
+echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
+# Double any \ or $. echo might interpret backslashes.
# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1974,15 +1865,15 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or
missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
if test -z "$MKDIR_P"; then
if test "${ac_cv_path_mkdir+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -2017,8 +1908,8 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
case $mkdir_p in
@@ -2030,10 +1921,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with
args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2046,7 +1937,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2057,23 +1948,22 @@
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" =
set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2090,12 +1980,12 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2114,8 +2004,8 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured;
run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make
distclean\" there first" >&2;}
+ { { echo "$as_me:$LINENO: error: source directory already configured; run
\"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make
distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@@ -2132,7 +2022,7 @@
# Define the identity of the package.
PACKAGE='texi2html'
- VERSION='1.81'
+ VERSION='1.82'
cat >>confdefs.h <<_ACEOF
@@ -2170,10 +2060,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program
name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2186,7 +2076,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2197,11 +2087,11 @@
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2210,10 +2100,10 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2226,7 +2116,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2237,11 +2127,11 @@
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -2249,8 +2139,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -2269,8 +2163,8 @@
AMTAR=${AMTAR-"${am_missing_run}tar"}
-{ $as_echo "$as_me:$LINENO: checking how to create a pax tar archive" >&5
-$as_echo_n "checking how to create a pax tar archive... " >&6; }
+{ echo "$as_me:$LINENO: checking how to create a pax tar archive" >&5
+echo $ECHO_N "checking how to create a pax tar archive... $ECHO_C" >&6; }
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar pax cpio none'
_am_tools=${am_cv_prog_tar_pax-$_am_tools}
@@ -2343,21 +2237,21 @@
rm -rf conftest.dir
if test "${am_cv_prog_tar_pax+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
am_cv_prog_tar_pax=$_am_tool
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_pax" >&5
-$as_echo "$am_cv_prog_tar_pax" >&6; }
+{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_pax" >&5
+echo "${ECHO_T}$am_cv_prog_tar_pax" >&6; }
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific
portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of
Makefiles... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific
portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of
Makefiles... $ECHO_C" >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2365,8 +2259,8 @@
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
@@ -2385,10 +2279,10 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PERL+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PERL in
[\\/]* | ?:[\\/]*)
@@ -2404,7 +2298,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2417,11 +2311,11 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
- { $as_echo "$as_me:$LINENO: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
+ { echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2511,12 +2405,11 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2545,29 +2438,17 @@
# program-specific install script used by HP pwplus--don't use.
:
else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two
"`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
break 3
fi
fi
- fi
done
done
;;
esac
-
done
IFS=$as_save_IFS
-rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -2580,8 +2461,8 @@
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -2599,34 +2480,34 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL
$ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub"
>&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
+{ 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
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must
specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { { 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=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub
$ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed"
>&2;}
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub
$ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed"
>&2;}
{ (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
@@ -2643,27 +2524,27 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
+{ 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
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub
$host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed"
>&2;}
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias
failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
@@ -2725,12 +2606,11 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var
contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains
a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -2763,12 +2643,12 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -2785,12 +2665,6 @@
# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
t clear
:clear
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[
]*\(.*\)/-D\1=\2/g
@@ -2820,7 +2694,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -2832,20 +2706,19 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}";
then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was
never defined.
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never
defined.
Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -2858,7 +2731,7 @@
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -2868,7 +2741,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -2890,45 +2763,17 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo";
then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ 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
# Support unset when possible.
@@ -2944,6 +2789,8 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -2966,7 +2813,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file
name" >&2
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file
name" >&2
{ (exit 1); exit 1; }
fi
@@ -2979,10 +2826,17 @@
PS4='+ '
# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+done
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -3004,7 +2858,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -3055,7 +2909,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX
shell" >&2
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX
shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -3083,6 +2937,7 @@
*)
ECHO_N='-n';;
esac
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -3095,10 +2950,10 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
+ mkdir conf$$.dir
fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
@@ -3106,11 +2961,8 @@
# In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
+elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
else
as_ln_s='cp -p'
fi
@@ -3160,8 +3012,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by texi2html $as_me 1.81, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+This file was extended by texi2html $as_me 1.82, which was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3174,29 +3026,22 @@
_ACEOF
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet, --silent
- do not print progress messages
+ -q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
@@ -3208,13 +3053,13 @@
Report bugs to <address@hidden>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-texi2html config.status 1.81
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
+texi2html config.status 1.82
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3222,12 +3067,11 @@
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value. By we need to know if files were specified by the user.
ac_need_defaults=:
while test $# != 0
do
@@ -3249,24 +3093,21 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
+ echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
+ -*) { echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@ -3285,32 +3126,30 @@
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create
--no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args
\$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
export CONFIG_SHELL
- exec "\$@"
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create
--no-recursion
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- $as_echo "$ac_log"
+ echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -3344,8 +3183,8 @@
"test/many_input_files/Makefile") CONFIG_FILES="$CONFIG_FILES
test/many_input_files/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target"
>&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@ -3384,143 +3223,142 @@
(umask 077 && mkdir "$tmp")
} ||
{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
+ echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+PACKAGE_DATE!$PACKAGE_DATE$ac_delim
+PERL!$PERL$ac_delim
+USE_UNICODE!$USE_UNICODE$ac_delim
+USE_UNIDECODE!$USE_UNIDECODE$ac_delim
+USE_DATA_DUMPER!$USE_DATA_DUMPER$ac_delim
+REQUIRE_DATA_DUMPER!$REQUIRE_DATA_DUMPER$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
-rm -f conf$$subs.sh
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = ""
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field[1])
- for (i = 2; i < nfields; i++) {
- key = field[i]
- keylen = length(key)
- if (S_is_set[key]) {
- value = S[key]
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field[++i])
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files
machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
-_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -3537,21 +3375,19 @@
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
fi # test -n "$CONFIG_FILES"
-eval set X " :F $CONFIG_FILES "
-shift
-for ac_tag
+for ac_tag in :F $CONFIG_FILES
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -3580,38 +3416,26 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f"
>&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;;
esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
+ ac_file_inputs="$ac_file_inputs $ac_f"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
- `' by configure.'
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/[\\\\&|]/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *:-:* | *:-) cat >"$tmp/stdin";;
esac
;;
esac
@@ -3621,7 +3445,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -3647,7 +3471,7 @@
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -3656,7 +3480,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -3677,17 +3501,17 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create
directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create
directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed
's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -3732,13 +3556,12 @@
esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
+case `sed -n '/datarootdir/ {
p
q
}
@@ -3747,14 +3570,13 @@
/@infodir@/p
/@localedir@/p
/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
*datarootdir*) ac_datarootdir_seen=yes;;
address@hidden@*|address@hidden@*|address@hidden@*|address@hidden@*|address@hidden@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the
--datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir
setting" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the
--datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir
setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@ -3768,16 +3590,15 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -3788,28 +3609,21 @@
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk"
>$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z
"$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the
variable \`datarootdir'
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the
variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable
\`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable
\`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
- esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
;;
@@ -3831,11 +3645,6 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
-test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS"
>&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -3857,8 +3666,4 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no;
then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options:
$ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- configure.ac 2 Jan 2009 04:22:27 -0000 1.17
+++ configure.ac 6 Jan 2009 00:35:26 -0000 1.18
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT([texi2html], [1.81], address@hidden)
+AC_INIT([texi2html], [1.82], address@hidden)
dnl 1.9 because we need tar-pax, and tar-pax because we have very long
dnl filenames for some test files
AM_INIT_AUTOMAKE([gnu 1.9 dist-bzip2 dist-zip tar-pax])
Index: install-sh
===================================================================
RCS file: /cvsroot/texi2html/texi2html/install-sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- install-sh 7 Jul 2005 21:44:55 -0000 1.2
+++ install-sh 6 Jan 2009 00:35:26 -0000 1.3
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-02-02.21
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
@@ -95,7 +110,7 @@
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test -n "$1"; do
+while test $# -ne 0; do
case $1 in
-c) shift
continue;;
@@ -111,9 +126,15 @@
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
+ -m) mode=$2
shift
shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
continue;;
-o) chowncmd="$chownprog $2"
@@ -136,9 +157,19 @@
--version) echo "$0 $scriptversion"; exit $?;;
- *) # When -d is used, all remaining arguments are directories to create.
+ --) shift
+ break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
+ esac
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
# Otherwise, the last argument is the destination. Remove it from
address@hidden
for arg
do
@@ -150,11 +181,9 @@
shift # arg
dstarg=$arg
done
- break;;
- esac
-done
+fi
-if test -z "$1"; then
+if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -164,6 +193,33 @@
exit 0
fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
for src
do
# Protect names starting with `-'.
@@ -173,15 +229,11 @@
if test -n "$dir_arg"; then
dst=$src
- src=
-
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
else
+
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
fi
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
- # Make sure that the destination directory exists.
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@address@hidden' -e 'address@hidden@/@'`
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
shift
+ $posix_glob && set +f
IFS=$oIFS
- pathcomp=
+ prefixes=
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
- shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
fi
- pathcomp=$pathcomp/
+ fi
+ prefix=$prefix/
done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -276,10 +462,10 @@
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|| {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
@@ -304,16 +491,13 @@
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ $doit $mvcmd "$dsttmp" "$dst"
}
- }
- fi || { (exit 1); exit 1; }
-done
+ } || exit 1
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
+ trap '' 0
+ fi
+done
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Index: missing
===================================================================
RCS file: /cvsroot/texi2html/texi2html/missing,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- missing 7 Jul 2005 21:44:55 -0000 1.3
+++ missing 6 Jan 2009 00:35:26 -0000 1.4
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-02-08.22
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <address@hidden>, 1996.
@@ -19,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,14 +290,23 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/address@hidden/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /address@hidden/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
@@ -314,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/texi2html/texi2html/mkinstalldirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- mkinstalldirs 7 Jul 2005 21:44:55 -0000 1.3
+++ mkinstalldirs 6 Jan 2009 00:35:26 -0000 1.4
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-02-02.21
+scriptversion=2006-05-11.19
# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
@@ -11,8 +11,11 @@
# bugs to <address@hidden> or send patches to
# <address@hidden>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
-dirmode=""
+dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -103,13 +106,21 @@
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
shift
+ IFS=$oIFS
- pathcomp=
for d
do
- pathcomp="$pathcomp$d"
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
@@ -124,7 +135,7 @@
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
+ lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
@@ -134,7 +145,7 @@
fi
fi
- pathcomp="$pathcomp/"
+ pathcomp=$pathcomp/
done
done
Index: texi2html.spec
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- texi2html.spec 2 Jan 2009 04:22:27 -0000 1.13
+++ texi2html.spec 6 Jan 2009 00:35:26 -0000 1.14
@@ -1,5 +1,5 @@
Name: texi2html
-Version: 1.81
+Version: 1.82
Release: 1
# GPLv2+ is for the code
# OFSFDL (Old FSF Documentation License) for the documentation
@@ -75,8 +75,8 @@
%dir %{_sysconfdir}/texinfo
%changelog
-* Sun Sep 9 2007 Patrice Dumas <address@hidden> 1.81-1
-- update to 1.81
+* Sun Sep 9 2007 Patrice Dumas <address@hidden> 1.82-1
+- update to 1.82
* Mon Nov 14 2005 Patrice Dumas <address@hidden> 1.77-1
- cleanups
Index: translations.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/translations.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- translations.pl 5 Jan 2009 01:00:23 -0000 1.23
+++ translations.pl 6 Jan 2009 00:35:26 -0000 1.24
@@ -1,337 +1,137 @@
-$LANGUAGES->{'fr'} = {
- ' The buttons in the navigation panels have the
following meaning:' => ' Les boutons de navigation ont la signification
suivante :',
- ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' Dans cet exemple on est @`a @strong{ Sous sous
section un-deux-trois } dans un document dont la structure est :',
- ' Up ' => 'Plus haut',
- '%{acronym_like} (%{explanation})' => '',
- '%{month} %{day}, %{year}' => 'le %{day} %{month}
%{year}',
- '%{name} of %{class}' => '%{name} de %{class}',
- '%{name} on %{class}' => '%{name} de %{class}',
+$LANGUAGES->{'de'} = {
+ ' The buttons in the navigation panels have the
following meaning:' => ' Die Links in der Navigationsleiste haben die folgende
Bedeutung: ',
+ ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' wobei das @strong{ Beispiel } annimmt, dass die
aktuelle Position bei @strong{ Unterabschnitt 1-2-3 } in einem Dokument mit
folgender Struktur liegt:',
+ ' Up ' => ' Nach oben ',
+ '%{acronym_like} (%{explanation})' => '%{acronym_like}
(%{explanation})',
+ '%{month} %{day}, %{year}' => '%{day}. %{month}
%{year}',
+ '%{name} of %{class}' => '',
+ '%{name} on %{class}' => '',
'%{node_file_href}' => '',
'%{node_file_href} @cite{%{book}}' => '',
- '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} section `%{section}\' dans
@cite{%{book}}',
- '%{reference_name}' => '',
- '%{style} %{number}' => '',
- '%{style}: %{caption_first_line}' => '',
- '%{style}: %{shortcaption_first_line}' => '',
- '@b{%{quotation_arg}:} ' => '',
- '@cite{%{book}}' => '',
- 'About' => 'A propos',
- 'About (help)' => 'A propos (page d\'aide)',
- 'About This Document' => 'A propos de ce document',
- 'April' => 'avril',
- 'August' => 'address@hidden',
- 'Back' => 'Retour',
+ '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
+ '%{reference_name}' => '%{reference_name}',
+ '%{style} %{number}' => '%{style} %{number}',
+ '%{style}: %{caption_first_line}' => '%{style}:
%{caption_first_line}',
+ '%{style}: %{shortcaption_first_line}' => '%{style}:
%{shortcaption_first_line}',
+ '@b{%{quotation_arg}:} ' => '@b{%{quotation_arg}:} ',
+ '@cite{%{book}}' => '@cite{%{book}}',
+ 'About' => '@"Uber',
+ 'About (help)' => '@"Uber (Hilfe)',
+ 'About This Document' => '@"Uber dieses Dokument',
+ 'April' => 'April',
+ 'August' => 'August',
+ 'Back' => 'Zur@"uck',
'Back section in previous file' => '',
- 'Beginning of this chapter or previous chapter' =>
'address@hidden'ebut de ce chapitre ou chapitre
address@hidden'address@hidden'edent',
- 'Button' => 'Bouton',
- 'Contents' => 'Table des address@hidden',
- 'Cover (top) of document' => 'Couverture (top) du
document',
- 'Current Position' => 'Position',
- 'Current section' => 'Section actuelle',
- 'December' => 'address@hidden'ecembre',
- 'FastBack' => 'RetourRapide',
- 'FastForward' => 'AvanceRapide',
- 'February' => 'address@hidden'evrier',
- 'First' => 'Premier',
- 'First section in reading order' => 'address@hidden
section dans l\'ordre de lecture',
- 'Following' => 'Suivant',
- 'Following node' => 'address@hidden suivant',
- 'Footnotes' => 'Notes de bas de page',
- 'Forward' => 'Avant',
+ 'Beginning of this chapter or previous chapter' =>
'Anfang dieses oder des letzten Kapitels',
+ 'Button' => '',
+ 'Contents' => 'Inhalt',
+ 'Cover (top) of document' => 'Titelseite des Dokuments',
+ 'Current Position' => 'Aktuelle Position',
+ 'Current section' => 'Aktueller Abschnitt',
+ 'December' => 'Dezember',
+ 'FastBack' => '',
+ 'FastForward' => '',
+ 'February' => 'Februar',
+ 'First' => '',
+ 'First section in reading order' => 'Erster Abschnitt
in Lesereihenfolge',
+ 'Following' => '',
+ 'Following node' => 'N@"achster Knoten',
+ 'Footnotes' => 'address@hidden',
+ 'Forward' => 'Nach vorne',
'Forward section in next file' => '',
- 'From 1.2.3 go to' => 'Depuis 1.2.3 aller @`a',
- 'Go to' => 'Aller @`a',
+ 'From 1.2.3 go to' => 'Von 1.2.3 gehe zu',
+ 'Go to' => 'Gehe zu',
'Index' => 'Index',
- 'Index Entry' => 'address@hidden'ee d\'index',
- 'January' => 'janvier',
- 'July' => 'juillet',
- 'Jump to' => 'Aller @`a',
- 'June' => 'juin',
- 'Last' => 'Dernier',
- 'Last section in reading order' => 'address@hidden
section dans l\'ordre de lecture',
- 'March' => 'mars',
- 'May' => 'mai',
- 'Menu:' => 'Menu@ :',
- 'Name' => 'Nom',
- 'Next' => 'Suivant',
- 'Next chapter' => 'Chapitre suivant',
- 'Next file' => 'Fichier suivant',
- 'Next node' => 'address@hidden suivant',
- 'Next section in reading order' => 'Section suivante
dans l\'ordre de lecture',
- 'Next section on same level' => 'Section suivante au
address@hidden niveau',
- 'NextFile' => 'FichierSuivant',
- 'Node following in node reading order' =>
'address@hidden suivant dans l\'ordre de lecture',
- 'Node up' => 'address@hidden au dessus',
- 'NodeNext' => 'address@hidden',
- 'NodePrev' => 'address@hidden@\'address@hidden'edent',
- 'NodeUp' => 'address@hidden',
- 'November' => 'novembre',
- 'October' => 'octobre',
- 'Overview' => 'Vue d\'ensemble',
- 'Overview:' => 'Vue d\'ensemble@ :',
- 'Prev' => 'address@hidden'address@hidden'edent',
- 'PrevFile' => '',
- 'Previous file' => 'Fichier
address@hidden'address@hidden'edent',
- 'Previous node' => 'address@hidden
address@hidden'address@hidden'edent',
- 'Previous section in reading order' => 'Section
address@hidden'address@hidden'edente dans l\'ordre de lecture',
- 'Previous section on same level' => 'Section
address@hidden'address@hidden'edente au address@hidden niveau',
- 'Section' => '',
- 'Section One' => 'Section un',
- 'See %{node_file_href}' => 'Voir %{node_file_href}',
- 'See %{node_file_href} @cite{%{book}}' => 'Voir
%{node_file_href} @cite{%{book}}',
- 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
- 'See %{reference_name}' => 'Voir %{reference_name}',
- 'See @cite{%{book}}' => 'Voir @cite{%{book}}',
- 'See section %{reference_name}' => 'Voir la section
%{reference_name}',
- 'See section `%{section}\' in @cite{%{book}}' => 'Voir
la section `%{section}\' dans @cite{%{book}}',
- 'September' => 'septembre',
- 'Short Table of Contents' =>
'address@hidden'address@hidden'e du contenu',
- 'Short table of contents' =>
'address@hidden'address@hidden'e du contenu',
- 'Subsection One-Four' => 'Sous section un-quatre',
- 'Subsection One-One' => 'Sous section un-un',
- 'Subsection One-Three' => 'Sous section un-trois',
- 'Subsection One-Two' => 'Sous section un-deux',
- 'Subsubsection One-Two-Four' => 'Sous sous section
un-deux-quatre',
- 'Subsubsection One-Two-One' => 'Sous sous section
un-deux-un',
- 'Subsubsection One-Two-Three' => 'Sous sous section
un-deux-trois',
- 'Subsubsection One-Two-Two' => 'Sous sous section
un-deux-deux',
- 'T2H_today' => '%2$d %1$s %3$d',
- 'Table of Contents' => 'Table des address@hidden',
- 'Table of contents' => 'Table des address@hidden',
- 'The node you are looking for is at %{href}.' => 'Le
address@hidden que vous recherchez est ici@ : %{href}.',
- 'This' => 'Ici',
- 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce
document a @\'address@hidden'e address@hidden'address@hidden'address@hidden'e
le @emph{%{date}} par @emph{%{user}} en utilisant @uref{%{program_homepage},
@emph{%{program}}}.',
- 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e par
@emph{%{user}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e le
@emph{%{date}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}',
- 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e en utilisant
@uref{%{program_homepage}, @emph{%{program}}}.',
- 'Top' => 'Racine',
- 'Untitled Document' => 'Document sans titre',
- 'Up' => 'Monter',
- 'Up node' => 'address@hidden au dessus',
- 'Up section' => 'Section address@hidden'erieure',
- 'by @emph{%{user}}' => 'par @emph{%{user}}',
- 'by @emph{%{user}} on @emph{%{date}}' => 'par
@emph{%{user}} le @emph{%{date}}',
- 'current' => 'courante',
- 'on @emph{%{date}}' => 'le @emph{%{date}}',
- 'section `%{section}\' in @cite{%{book}}' => 'section
`%{section}\' dans @cite{%{book}}',
- 'see %{node_file_href}' => 'voir %{node_file_href}',
- 'see %{node_file_href} @cite{%{book}}' => 'voir
%{node_file_href} @cite{%{book}}',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
- 'see %{reference_name}' => 'voir %{reference_name}',
- 'see @cite{%{book}}' => 'voir @cite{%{book}}',
- 'see section %{reference_name}' => 'voir la section
%{reference_name}',
- 'see section `%{section}\' in @cite{%{book}}' => 'voir
la section `%{section}\' dans @cite{{book}}',
- 'unknown' => 'inconnu'
- };
-
-$T2H_OBSOLETE_STRINGS->{'fr'} = {
- ' This document was generated
%{who_and_when_generated} using %{program_homepage_href}.' => ' Ce document a
été généré %{who_and_when_generated} en
utilisant %{program_homepage_href}.',
- ' where the <strong> Example </strong>
assumes that the current position is at <strong> Subsubsection One-Two-Three
</strong> of a document of the following structure:' => ' Dans cet exemple on
est à <strong> Sous section un-deux-trois </strong> dans un document
dont la structure est :',
- '%{node_file_href} section `%{section}\' in
<cite>%{book}</cite>' => '%{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
- 'See' => 'Voir',
- 'See %{node_file_href} <cite>%{book}</cite>'
=> 'Voir %{node_file_href} <cite>%{book}</cite>',
- 'See %{node_file_href} section `%{section}\'
in <cite>%{book}</cite>' => 'Voir %{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
- 'See <cite>%{book}</cite>' => 'Voir
<cite>%{book}</cite>',
- 'See section `%{section}\' in
<cite>%{book}</cite>' => 'Voir la section `%{section}\' dans
<cite>%{book}</cite>',
- 'This document was generated by
<i>%{user}</i> on <i>%{date}</i> using %{program_homepage_href}.' => 'Ce
document a été généré par <i>%{user}</i>
<i>%{date}</i> en utilisant %{program_homepage_href}.',
- 'This document was generated by
<i>%{user}</i> using %{program_homepage_href}.' => 'Ce document a
été généré par <i>%{user}</i> en utilisant
%{program_homepage_href}.',
- 'This document was generated by
@emph{%{user}} on @emph{%{date}} using %{program_homepage_href}.' => 'Ce
document a @\'address@hidden'e address@hidden'address@hidden'address@hidden'e
par @emph{%{user}} @emph{%{date}} en utilisant %{program_homepage_href}.',
- 'This document was generated by
@emph{%{user}} using %{program_homepage_href}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e par
@emph{%{user}} en utilisant %{program_homepage_href}.',
- 'This document was generated on
<i>%{date}</i> using %{program_homepage_href}.' => 'Ce document a
été généré <i>%{date}</i> en utilisant
%{program_homepage_href}.',
- 'This document was generated on
@emph{%{date}} using %{program_homepage_href}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e
@emph{%{date}} en utilisant %{program_homepage_href}.',
- 'This document was generated on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce
document a @\'address@hidden'e address@hidden'address@hidden'address@hidden'e
@emph{%{date}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated using
%{program_homepage_href}.' => 'Ce document a @\'address@hidden'e
address@hidden'address@hidden'address@hidden'e en utilisant
%{program_homepage_href}.',
- 'about (help)' => '@`a propos (page
d\'aide)',
- 'about (this page)' => 'a propos (cette
page)',
- 'beginning of this chapter or previous
chapter' => 'address@hidden'ebut de ce chapitre ou chapitre
address@hidden'address@hidden'edent',
- 'by <i>%{user}</i>' => 'par <i>%{user}</i>',
- 'by <i>%{user}</i> on <i>%{date}</i>' =>
'par <i>%{user}</i> <i>%{date}</i>',
- 'concept index' => 'index',
- 'cover (top) of document' => 'couverture
(top) du document',
- 'current section' => 'section actuelle',
- 'first section in reading order' =>
'address@hidden section dans l\'ordre de lecture',
- 'following node' => 'node suivant',
- 'index' => 'index',
- 'last section in reading order' =>
'address@hidden section dans l\'ordre de lecture',
- 'next chapter' => 'chapitre suivant',
- 'next node' => 'node suivant',
- 'next section in reading order' => 'section
suivante dans l\'ordre de lecture',
- 'next section on same level' => 'section
suivante au address@hidden niveau',
- 'node following in node reading order' =>
'node suivant dans l\'ordre des nodes',
- 'node up' => 'node au dessus',
- 'on <i>%{date}</i>' => '<i>%{date}</i>',
- 'previous node' => 'node
address@hidden'address@hidden'edent',
- 'previous section in reading order' =>
'section address@hidden'address@hidden'edente dans l\'ordre de lecture',
- 'previous section on same level' => 'section
address@hidden'address@hidden'edente au address@hidden niveau',
- 'section' => 'section',
- 'section `%{section}\' in
<cite>%{book}</cite>' => 'section `%{section}\' dans <cite>%{book}</cite>',
- 'see' => 'voir',
- 'see %{node_file_href} <cite>%{book}</cite>'
=> 'voir %{node_file_href} <cite>%{book}</cite>',
- 'see %{node_file_href} section `%{section}\'
in <cite>%{book}</cite>' => 'voir %{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
- 'see <cite>%{book}</cite>' => 'voir
<cite>%{book}</cite>',
- 'see section `%{section}\' in
<cite>%{book}</cite>' => 'voir la section `%{section}\' dans
<cite>%{book}</cite>',
- 'short table of contents' => 'table des
address@hidden address@hidden'address@hidden'ee',
- 'table of contents' => 'table des
address@hidden',
- 'up node' => 'node au dessus',
- 'up section' => 'section
address@hidden'erieure'
- };
-
-
-$LANGUAGES->{'pt_BR'} = {
- ' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
- ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
- ' Up ' => ' Acima ',
- '%{acronym_like} (%{explanation})' => '',
- '%{month} %{day}, %{year}' => '%{day} de %{month} de
%{year}',
- '%{name} of %{class}' => '%{name} da %{class}',
- '%{name} on %{class}' => '%{name} na %{class}',
- '%{node_file_href}' => '',
- '%{node_file_href} @cite{%{book}}' => '',
- '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
- '%{reference_name}' => '',
- '%{style} %{number}' => '',
- '%{style}: %{caption_first_line}' => '',
- '%{style}: %{shortcaption_first_line}' => '',
- '@b{%{quotation_arg}:} ' => '',
- '@cite{%{book}}' => '',
- 'About' => 'Sobre',
- 'About (help)' => 'Sobre (ajuda)',
- 'About This Document' => 'Sobre Esse Documento',
- 'April' => 'Abril',
- 'August' => 'Agosto',
- 'Back' => 'Volta',
- 'Back section in previous file' => '',
- 'Beginning of this chapter or previous chapter' =>
'Come@,{c}o desse address@hidden'itulo ou address@hidden'itulo anterior',
- 'Button' => 'address@hidden',
- 'Contents' => 'address@hidden'udo',
- 'Cover (top) of document' => 'address@hidden'icio
(topo) do documento',
- 'Current Position' => 'Posi@,address@hidden Atual',
- 'Current section' => 'Se@,address@hidden atual',
- 'December' => 'Dezembro',
- 'FastBack' => 'Voltar address@hidden'apido',
- 'FastForward' => 'Avan@,{c}ar address@hidden'apido',
- 'February' => 'Fevereiro',
- 'First' => 'Primeiro',
- 'First section in reading order' => 'Primeira
se@,address@hidden na ordem de leitura',
- 'Following' => 'Seguinte',
- 'Following node' => 'Nodo seguinte',
- 'Footnotes' => 'Notas de address@hidden'e',
- 'Forward' => 'Avan@,{c}ar',
- 'Forward section in next file' => '',
- 'From 1.2.3 go to' => 'De 1.2.3 address@hidden'a
para',
- 'Go to' => 'address@hidden'a para',
- 'Index' => '@\'Indice',
- 'Index Entry' => 'Entrada de @\'Indice',
- 'January' => 'Janeiro',
- 'July' => 'Julho',
- 'Jump to' => 'Pular para',
- 'June' => 'Junho',
- 'Last' => '@\'Ultimo',
- 'Last section in reading order' => '@\'Ultima
se@,address@hidden na ordem de leitura',
- 'March' => 'Mar@,{c}o',
- 'May' => 'Maio',
- 'Menu:' => '',
- 'Name' => 'Nome',
- 'Next' => 'address@hidden'oximo',
- 'Next chapter' => 'address@hidden'oximo
address@hidden'itulo',
+ 'Index Entry' => 'Indexeintrag',
+ 'January' => 'Januar',
+ 'July' => 'Juli',
+ 'Jump to' => 'Springe zu',
+ 'June' => 'Juni',
+ 'Last' => '',
+ 'Last section in reading order' => 'Letzter Abschnitt
in Lesereihenfolge',
+ 'March' => 'M@"arz',
+ 'May' => 'Mai',
+ 'Menu:' => 'Auswahl:',
+ 'Name' => 'Name',
+ 'Next' => '',
+ 'Next chapter' => 'N@"achstes Kapitel',
'Next file' => '',
- 'Next node' => 'address@hidden'oximo nodo',
- 'Next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
- 'Next section on same level' =>
'address@hidden'oxima se@,address@hidden no mesmo address@hidden'ivel',
+ 'Next node' => 'N@"achster Knoten',
+ 'Next section in reading order' => 'N@"achster
Abschnitt in Lesereihenfolge',
+ 'Next section on same level' => 'N@"achster Abschitt
derselben Ebene',
'NextFile' => '',
- 'Node following in node reading order' => 'Nodo
seguinte na ordem de leitura de nodos',
- 'Node up' => 'Nodo acima',
- 'NodeNext' => 'address@hidden'oximo Nodo',
- 'NodePrev' => 'Nodo Anterior',
- 'NodeUp' => 'Nodo Acima',
- 'November' => 'Novembro',
- 'October' => 'Outubro',
- 'Overview' => 'address@hidden geral',
- 'Overview:' => 'address@hidden geral:',
- 'Prev' => 'address@hidden'evio',
+ 'Node following in node reading order' => 'N@"achster
Abschnitt in Lesereihenfolge',
+ 'Node up' => 'Knoten nach oben',
+ 'NodeNext' => '',
+ 'NodePrev' => '',
+ 'NodeUp' => '',
+ 'November' => 'November',
+ 'October' => 'Oktober',
+ 'Overview' => '@"Ubersicht',
+ 'Overview:' => '@"Ubersicht:',
+ 'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
- 'Previous node' => 'Nodo anterior',
- 'Previous section in reading order' =>
'Se@,address@hidden anterior na ordem de leitura',
- 'Previous section on same level' =>
'Se@,address@hidden anterior no mesmo address@hidden'ivel',
- 'Section' => 'Se@,address@hidden',
- 'Section One' => 'Se@,address@hidden Um',
- 'See %{node_file_href}' => 'Veja %{node_file_href}',
- 'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
- 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
- 'See %{reference_name}' => 'Veja %{reference_name}',
- 'See @cite{%{book}}' => 'Veja @cite{%{book}}',
- 'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
- 'See section `%{section}\' in @cite{%{book}}' =>
'Veja se@,address@hidden `%{section}\' em @cite{%{book}}',
- 'September' => 'Setembro',
- 'Short Table of Contents' => 'Breve
address@hidden'ario',
- 'Short table of contents' => 'Breve
address@hidden'ario',
- 'Subsection One-Four' => 'Subse@,address@hidden
Um-Quatro',
- 'Subsection One-One' => 'Subse@,address@hidden
Um-Um',
- 'Subsection One-Three' => 'Subse@,address@hidden
address@hidden',
- 'Subsection One-Two' => 'Subse@,address@hidden
Um-Dois',
- 'Subsubsection One-Two-Four' =>
'Subse@,address@hidden Um-Dois-Quatro',
- 'Subsubsection One-Two-One' =>
'Subse@,address@hidden Um-Dois-Um',
- 'Subsubsection One-Two-Three' =>
'Subse@,address@hidden address@hidden',
- 'Subsubsection One-Two-Two' =>
'Subse@,address@hidden Um-Dois-Dois',
+ 'Previous node' => 'Voriger Knoten',
+ 'Previous section in reading order' => 'Voriger
Abschnitt in Lesereihenfolge',
+ 'Previous section on same level' => 'Voriger Abschnitt
derselben Ebene',
+ 'Section' => 'Abschnitt',
+ 'Section One' => 'Abschnitt 1',
+ 'See %{node_file_href}' => 'Siehe %{node_file_href}',
+ 'See %{node_file_href} @cite{%{book}}' => 'Siehe
%{node_file_href} @cite{%{book}}',
+ 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Siehe %{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
+ 'See %{reference_name}' => '',
+ 'See @cite{%{book}}' => '',
+ 'See section %{reference_name}' => '',
+ 'See section `%{section}\' in @cite{%{book}}' => 'Siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'September' => 'September',
+ 'Short Table of Contents' => 'Kurzes
Inhaltsverzeichnis',
+ 'Short table of contents' => 'Kurzes
Inhaltsverzeichnis',
+ 'Subsection One-Four' => 'Unterabschnitt 1-4',
+ 'Subsection One-One' => 'Unterabschnitt 1-1',
+ 'Subsection One-Three' => 'Unterabschnitt 1-3',
+ 'Subsection One-Two' => 'Unterabschnitt 1-2',
+ 'Subsubsection One-Two-Four' => 'Unterabschnitt 1-2-4',
+ 'Subsubsection One-Two-One' => 'Unterabschnitt 1-2-1',
+ 'Subsubsection One-Two-Three' => 'Unterabschnitt 1-2-3',
+ 'Subsubsection One-Two-Two' => 'Unterabschnitt 1-2-2',
'T2H_today' => '',
- 'Table of Contents' => 'address@hidden'ario',
- 'Table of contents' => 'address@hidden'ario',
- 'The node you are looking for is at %{href}.' => 'O
nodo que address@hidden address@hidden'a olhando address@hidden'a em %{href}.',
- 'This' => 'Esse',
- 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse
documento foi gereado por @emph{%{user}} em @emph{%{date}} usando
@uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
por @emph{%{user}} usando @uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Esse documento foi gerado em
@i{%{date}} usando @uref{%{program_homepage}, @i{%{program}}}.',
- 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
usando @uref{%{program_homepage}, @emph{%{program}}}.',
- 'Top' => 'Topo',
- 'Untitled Document' => 'Documento Sem Nome',
- 'Up' => 'Acima',
- 'Up node' => 'Nodo acima',
- 'Up section' => 'Se@,address@hidden acima',
- 'by @emph{%{user}}' => 'por @emph{%{user}}',
- 'by @emph{%{user}} on @emph{%{date}}' => 'por
@emph{%{user}} em @emph{%{date}}',
- 'current' => 'atual',
- 'on @emph{%{date}}' => 'em @emph{%{date}}',
- 'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
- 'see %{node_file_href}' => 'veja %{node_file_href}',
- 'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
- 'see %{reference_name}' => 'veja %{reference_name}',
- 'see @cite{%{book}}' => 'veja @cite{%{book}}',
- 'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
- 'see section `%{section}\' in @cite{%{book}}' =>
'veja se@,address@hidden `%{section}\' em @cite{%{book}}',
- 'unknown' => 'desconhecido'
+ 'Table of Contents' => 'Inhaltsverzeichnis',
+ 'Table of contents' => 'Inhaltsverzeichnis',
+ 'The node you are looking for is at %{href}.' => 'Der
Knoten, den Sie sehen, befindet sich bei %{href}',
+ 'This' => '',
+ 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Dieses
Dokument wurde erzeugt von @emph{%{user}} am @emph{%{date}} durch
@uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Dieses Dokument wurde
erzeugt von @emph{%{user}} durch @uref{%{program_homepage},
@emph{%{program}}}.',
+ 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Dieses Dokument wurde erzeugt
am @i{%{date}} durch @uref{%{program_homepage}, @i{%{program}}}.',
+ 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Dieses Dokument wurde
erzeugt durch @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'Top' => 'Anfang',
+ 'Untitled Document' => 'Unbenanntes Dokumen',
+ 'Up' => 'Nach oben',
+ 'Up node' => 'Knoten nach oben',
+ 'Up section' => 'Abschnitt nach oben',
+ 'by @emph{%{user}}' => 'von @emph{%{user}}',
+ 'by @emph{%{user}} on @emph{%{date}}' => 'von
@emph{%{user}} am @emph{%{date}}',
+ 'current' => '',
+ 'on @emph{%{date}}' => 'am @emph{%{date}}',
+ 'section `%{section}\' in @cite{%{book}}' => 'Abschnitt
`%{section}\' in @cite{%{book}}',
+ 'see %{node_file_href}' => 'siehe %{node_file_href}',
+ 'see %{node_file_href} @cite{%{book}}' => 'siehe
%{node_file_href} @cite{%{book}}',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'siehe %{node_file_href} im Abschnitt `%{section}\' in
@cite{%{book}}',
+ 'see %{reference_name}' => 'siehe %{reference_name}',
+ 'see @cite{%{book}}' => 'siehe @cite{%{book}}',
+ 'see section %{reference_name}' => 'siehe Abschnitt
%{reference_name}',
+ 'see section `%{section}\' in @cite{%{book}}' => 'siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'unknown' => 'unbekannt'
};
-$T2H_OBSOLETE_STRINGS->{'pt_BR'} = {
- 'See' => 'Veja',
- 'about (help)' => 'sobre (ajuda)',
- 'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
- 'cover (top) of document' =>
'address@hidden'icio (topo) do documento',
- 'current section' => 'se@,address@hidden
atual',
- 'first section in reading order' =>
'primeira se@,address@hidden na ordem de leitura',
- 'following node' => 'nodo seguinte',
- 'index' => '@\'indice',
- 'last section in reading order' =>
'@\'ultima se@,address@hidden na ordem de leitura',
- 'next chapter' => 'address@hidden'oximo
address@hidden'itulo',
- 'next node' => 'address@hidden'oximo
nodo',
- 'next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
- 'next section on same level' =>
'address@hidden'oxima se@,address@hidden no mesmo address@hidden'ivel',
- 'node following in node reading order' =>
'nodo seguinte na ordem de leitura de nodos',
- 'node up' => 'nodo acima',
- 'previous node' => 'nodo anterior',
- 'previous section in reading order' =>
'se@,address@hidden anterior na ordem de leitura',
- 'previous section on same level' =>
'se@,address@hidden anterior no mesmo address@hidden'ivel',
- 'section' => 'Se@,address@hidden',
- 'see' => 'veja',
- 'short table of contents' => 'breve
address@hidden'ario',
- 'table of contents' =>
'address@hidden'ario',
- 'up node' => 'nodo acima',
- 'up section' => 'se@,address@hidden acima'
+$T2H_OBSOLETE_STRINGS->{'de'} = {
+ 'See' => 'Siehe',
+ 'section' => 'Abschnitt',
+ 'see' => 'siehe'
};
-$LANGUAGES->{'nl'} = {
+$LANGUAGES->{'en'} = {
' The buttons in the navigation panels have the
following meaning:' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
@@ -350,9 +150,9 @@
'@cite{%{book}}' => '',
'About' => '',
'About (help)' => '',
- 'About This Document' => 'No translation available!',
- 'April' => 'April',
- 'August' => 'Augustus',
+ 'About This Document' => '',
+ 'April' => '',
+ 'August' => '',
'Back' => '',
'Back section in previous file' => '',
'Beginning of this chapter or previous chapter' => '',
@@ -361,29 +161,29 @@
'Cover (top) of document' => '',
'Current Position' => '',
'Current section' => '',
- 'December' => 'December',
+ 'December' => '',
'FastBack' => '',
'FastForward' => '',
- 'February' => 'Februari',
+ 'February' => '',
'First' => '',
'First section in reading order' => '',
'Following' => '',
'Following node' => '',
- 'Footnotes' => 'No translation available!',
+ 'Footnotes' => '',
'Forward' => '',
'Forward section in next file' => '',
'From 1.2.3 go to' => '',
'Go to' => '',
- 'Index' => 'Index',
+ 'Index' => '',
'Index Entry' => '',
- 'January' => 'Januari',
- 'July' => 'Juli',
+ 'January' => '',
+ 'July' => '',
'Jump to' => '',
- 'June' => 'Juni',
+ 'June' => '',
'Last' => '',
'Last section in reading order' => '',
- 'March' => 'Maart',
- 'May' => 'Mei',
+ 'March' => '',
+ 'May' => '',
'Menu:' => '',
'Name' => '',
'Next' => '',
@@ -398,8 +198,8 @@
'NodeNext' => '',
'NodePrev' => '',
'NodeUp' => '',
- 'November' => 'November',
- 'October' => 'Oktober',
+ 'November' => '',
+ 'October' => '',
'Overview' => '',
'Overview:' => '',
'Prev' => '',
@@ -417,8 +217,8 @@
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
- 'September' => 'September',
- 'Short Table of Contents' => 'Korte inhoudsopgave',
+ 'September' => '',
+ 'Short Table of Contents' => '',
'Short table of contents' => '',
'Subsection One-Four' => '',
'Subsection One-One' => '',
@@ -428,8 +228,8 @@
'Subsubsection One-Two-One' => '',
'Subsubsection One-Two-Three' => '',
'Subsubsection One-Two-Two' => '',
- 'T2H_today' => '',
- 'Table of Contents' => 'Inhoudsopgave',
+ 'T2H_today' => '%s, %d %d',
+ 'Table of Contents' => '',
'Table of contents' => '',
'The node you are looking for is at %{href}.' => '',
'This' => '',
@@ -457,10 +257,318 @@
'unknown' => ''
};
-$T2H_OBSOLETE_STRINGS->{'nl'} = {
- 'See' => 'Zie',
- 'section' => 'sectie',
- 'see' => 'zie'
+$T2H_OBSOLETE_STRINGS->{'en'} = {};
+
+
+$LANGUAGES->{'es'} = {
+ ' The buttons in the navigation panels have the
following meaning:' => ' Los botones de los paneles de address@hidden'on
tienen el significado siguiente:',
+ ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' donde el @strong{ Ejemplo } supone que la
posición actual está en la @strong{ address@hidden'on uno-dos-tres } de un
documento de la estructura siguiente:',
+ ' Up ' => ' Subir ',
+ '%{acronym_like} (%{explanation})' => '',
+ '%{month} %{day}, %{year}' => 'el %{day} %{month}
%{year}',
+ '%{name} of %{class}' => '%{name} de %{class}',
+ '%{name} on %{class}' => '%{name} en %{class}',
+ '%{node_file_href}' => '',
+ '%{node_file_href} @cite{%{book}}' => '',
+ '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} address@hidden'on `%{section}\' en
@cite{%{book}}',
+ '%{reference_name}' => '',
+ '%{style} %{number}' => '',
+ '%{style}: %{caption_first_line}' => '',
+ '%{style}: %{shortcaption_first_line}' => '',
+ '@b{%{quotation_arg}:} ' => '',
+ '@cite{%{book}}' => '',
+ 'About' => 'Acerca de',
+ 'About (help)' => 'Acerca de (address@hidden'agina de
ayuda)',
+ 'About This Document' => 'Acerca de este documento',
+ 'April' => 'abril',
+ 'August' => 'agosto',
+ 'Back' => 'address@hidden'as',
+ 'Back section in previous file' => 'Retroceder
address@hidden'on en el archivo anterior',
+ 'Beginning of this chapter or previous chapter' =>
'Inicio de este address@hidden'itulo o address@hidden'itulo anterior',
+ 'Button' => 'address@hidden'on',
+ 'Contents' => '@\'Indice general',
+ 'Cover (top) of document' => 'Portada del documento',
+ 'Current Position' => 'address@hidden'on actual',
+ 'Current section' => 'address@hidden'on actual',
+ 'December' => 'diciembre',
+ 'FastBack' => 'Retroceso address@hidden'apido',
+ 'FastForward' => 'Avance address@hidden'apido',
+ 'February' => 'febrero',
+ 'First' => 'Primero',
+ 'First section in reading order' => 'Primera
address@hidden'on en orden de lectura',
+ 'Following' => 'Siguiente',
+ 'Following node' => 'Nodo siguiente',
+ 'Footnotes' => 'Notas el pie',
+ 'Forward' => 'Adelante',
+ 'Forward section in next file' => 'Avanzar
address@hidden'on en el address@hidden'oximo archivo',
+ 'From 1.2.3 go to' => 'Desde 1.2.3 ir a',
+ 'Go to' => 'Ir a',
+ 'Index' => '@\'Indice',
+ 'Index Entry' => 'Entrada de @\'indice',
+ 'January' => 'enero',
+ 'July' => 'julio',
+ 'Jump to' => 'Saltar a',
+ 'June' => 'junio',
+ 'Last' => '@\'Ultimo',
+ 'Last section in reading order' => '@\'Ultima
address@hidden'on en orden de lectura',
+ 'March' => 'marzo',
+ 'May' => 'mayo',
+ 'Menu:' => 'address@hidden'u:',
+ 'Name' => 'Nombre',
+ 'Next' => 'Siguiente',
+ 'Next chapter' => 'address@hidden'itulo siguiente',
+ 'Next file' => 'Archivo siguiente',
+ 'Next node' => 'Nodo siguiente',
+ 'Next section in reading order' => 'address@hidden'on
siguiente en orden de lectura',
+ 'Next section on same level' => 'address@hidden'on
siguiente en el mismo nivel',
+ 'NextFile' => 'ArchivoSiguiente',
+ 'Node following in node reading order' => 'Nodo
siguiente en orden de lectura de nodos',
+ 'Node up' => 'Subir nodo',
+ 'NodeNext' => 'NodoSiguiente',
+ 'NodePrev' => 'NodoAnterior',
+ 'NodeUp' => 'SubirNodo',
+ 'November' => 'noviembre',
+ 'October' => 'octubre',
+ 'Overview' => 'address@hidden'amica',
+ 'Overview:' => 'address@hidden'amica:',
+ 'Prev' => 'Ant',
+ 'PrevFile' => 'ArchivoAnt',
+ 'Previous file' => 'Archivo anterior',
+ 'Previous node' => 'Nodo anterior',
+ 'Previous section in reading order' =>
'address@hidden'on anterior en orden de lectura',
+ 'Previous section on same level' => 'address@hidden'on
anterior en el mismo nivel',
+ 'Section' => 'address@hidden'on',
+ 'Section One' => 'address@hidden'on Uno',
+ 'See %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
+ 'See %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
+ 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
+ 'See %{reference_name}' => 'address@hidden'ease
%{reference_name}',
+ 'See @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
+ 'See section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
+ 'See section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'September' => 'septiembre',
+ 'Short Table of Contents' => 'Resumen del Contenido',
+ 'Short table of contents' => 'Resumen del contenido',
+ 'Subsection One-Four' => 'address@hidden'on uno-cuatro',
+ 'Subsection One-One' => 'address@hidden'on uno-uno',
+ 'Subsection One-Three' => 'address@hidden'on uno-tres',
+ 'Subsection One-Two' => 'address@hidden'on uno-dos',
+ 'Subsubsection One-Two-Four' => 'address@hidden'on
uno-dos-cuatro',
+ 'Subsubsection One-Two-One' => 'address@hidden'on
uno-dos-uno',
+ 'Subsubsection One-Two-Three' => 'address@hidden'on
uno-dos-tres',
+ 'Subsubsection One-Two-Two' => 'address@hidden'on
uno-dos-dos',
+ 'T2H_today' => '%2$d %1$s %3$d',
+ 'Table of Contents' => '@\'address@hidden General',
+ 'Table of contents' => '@\'address@hidden general',
+ 'The node you are looking for is at %{href}.' => 'El
nodo que busca se encuentra en %{href}.',
+ 'This' => 'Este',
+ 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Este
documento ha sido generado por @emph{%{user}} el @emph{%{date}} utilizando
@uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Este documento ha sido
generado por @emph{%{user}} utilizando @uref{%{program_homepage},
@emph{%{program}}}.',
+ 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Este documento se generó el
@i{%{date}} utilizando @uref{%{program_homepage}, @i{%{program}}}.',
+ 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Este documento se generó
utilizando @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'Top' => 'Arriba',
+ 'Untitled Document' => 'Documento sin
address@hidden'itulo',
+ 'Up' => 'Subir',
+ 'Up node' => 'Subir nodo',
+ 'Up section' => 'Subir address@hidden'on',
+ 'by @emph{%{user}}' => 'por @emph{%{user}',
+ 'by @emph{%{user}} on @emph{%{date}}' => 'por
@emph{%{user}} el @emph{%{date}}',
+ 'current' => 'actual',
+ 'on @emph{%{date}}' => 'el @emph{%{date}}',
+ 'section `%{section}\' in @cite{%{book}}' =>
'address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'see %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
+ 'see %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
+ 'see %{reference_name}' => 'address@hidden'ease
%{reference_name}',
+ 'see @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
+ 'see section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
+ 'see section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'unknown' => 'desconocido'
+ };
+
+$T2H_OBSOLETE_STRINGS->{'es'} = {
+ 'See' => 'address@hidden'ease',
+ 'section' => 'address@hidden'on',
+ 'see' => 'address@hidden'ease'
+ };
+
+
+$LANGUAGES->{'fr'} = {
+ ' The buttons in the navigation panels have the
following meaning:' => ' Les boutons de navigation ont la signification
suivante :',
+ ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' Dans cet exemple on est @`a @strong{ Sous sous
section un-deux-trois } dans un document dont la structure est :',
+ ' Up ' => 'Plus haut',
+ '%{acronym_like} (%{explanation})' => '',
+ '%{month} %{day}, %{year}' => 'le %{day} %{month}
%{year}',
+ '%{name} of %{class}' => '%{name} de %{class}',
+ '%{name} on %{class}' => '%{name} de %{class}',
+ '%{node_file_href}' => '',
+ '%{node_file_href} @cite{%{book}}' => '',
+ '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} section `%{section}\' dans
@cite{%{book}}',
+ '%{reference_name}' => '',
+ '%{style} %{number}' => '',
+ '%{style}: %{caption_first_line}' => '',
+ '%{style}: %{shortcaption_first_line}' => '',
+ '@b{%{quotation_arg}:} ' => '',
+ '@cite{%{book}}' => '',
+ 'About' => 'A propos',
+ 'About (help)' => 'A propos (page d\'aide)',
+ 'About This Document' => 'A propos de ce document',
+ 'April' => 'avril',
+ 'August' => 'address@hidden',
+ 'Back' => 'Retour',
+ 'Back section in previous file' => '',
+ 'Beginning of this chapter or previous chapter' =>
'address@hidden'ebut de ce chapitre ou chapitre
address@hidden'address@hidden'edent',
+ 'Button' => 'Bouton',
+ 'Contents' => 'Table des address@hidden',
+ 'Cover (top) of document' => 'Couverture (top) du
document',
+ 'Current Position' => 'Position',
+ 'Current section' => 'Section actuelle',
+ 'December' => 'address@hidden'ecembre',
+ 'FastBack' => 'RetourRapide',
+ 'FastForward' => 'AvanceRapide',
+ 'February' => 'address@hidden'evrier',
+ 'First' => 'Premier',
+ 'First section in reading order' => 'address@hidden
section dans l\'ordre de lecture',
+ 'Following' => 'Suivant',
+ 'Following node' => 'address@hidden suivant',
+ 'Footnotes' => 'Notes de bas de page',
+ 'Forward' => 'Avant',
+ 'Forward section in next file' => '',
+ 'From 1.2.3 go to' => 'Depuis 1.2.3 aller @`a',
+ 'Go to' => 'Aller @`a',
+ 'Index' => 'Index',
+ 'Index Entry' => 'address@hidden'ee d\'index',
+ 'January' => 'janvier',
+ 'July' => 'juillet',
+ 'Jump to' => 'Aller @`a',
+ 'June' => 'juin',
+ 'Last' => 'Dernier',
+ 'Last section in reading order' => 'address@hidden
section dans l\'ordre de lecture',
+ 'March' => 'mars',
+ 'May' => 'mai',
+ 'Menu:' => 'Menu@ :',
+ 'Name' => 'Nom',
+ 'Next' => 'Suivant',
+ 'Next chapter' => 'Chapitre suivant',
+ 'Next file' => 'Fichier suivant',
+ 'Next node' => 'address@hidden suivant',
+ 'Next section in reading order' => 'Section suivante
dans l\'ordre de lecture',
+ 'Next section on same level' => 'Section suivante au
address@hidden niveau',
+ 'NextFile' => 'FichierSuivant',
+ 'Node following in node reading order' =>
'address@hidden suivant dans l\'ordre de lecture',
+ 'Node up' => 'address@hidden au dessus',
+ 'NodeNext' => 'address@hidden',
+ 'NodePrev' => 'address@hidden@\'address@hidden'edent',
+ 'NodeUp' => 'address@hidden',
+ 'November' => 'novembre',
+ 'October' => 'octobre',
+ 'Overview' => 'Vue d\'ensemble',
+ 'Overview:' => 'Vue d\'ensemble@ :',
+ 'Prev' => 'address@hidden'address@hidden'edent',
+ 'PrevFile' => '',
+ 'Previous file' => 'Fichier
address@hidden'address@hidden'edent',
+ 'Previous node' => 'address@hidden
address@hidden'address@hidden'edent',
+ 'Previous section in reading order' => 'Section
address@hidden'address@hidden'edente dans l\'ordre de lecture',
+ 'Previous section on same level' => 'Section
address@hidden'address@hidden'edente au address@hidden niveau',
+ 'Section' => '',
+ 'Section One' => 'Section un',
+ 'See %{node_file_href}' => 'Voir %{node_file_href}',
+ 'See %{node_file_href} @cite{%{book}}' => 'Voir
%{node_file_href} @cite{%{book}}',
+ 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
+ 'See %{reference_name}' => 'Voir %{reference_name}',
+ 'See @cite{%{book}}' => 'Voir @cite{%{book}}',
+ 'See section %{reference_name}' => 'Voir la section
%{reference_name}',
+ 'See section `%{section}\' in @cite{%{book}}' => 'Voir
la section `%{section}\' dans @cite{%{book}}',
+ 'September' => 'septembre',
+ 'Short Table of Contents' =>
'address@hidden'address@hidden'e du contenu',
+ 'Short table of contents' =>
'address@hidden'address@hidden'e du contenu',
+ 'Subsection One-Four' => 'Sous section un-quatre',
+ 'Subsection One-One' => 'Sous section un-un',
+ 'Subsection One-Three' => 'Sous section un-trois',
+ 'Subsection One-Two' => 'Sous section un-deux',
+ 'Subsubsection One-Two-Four' => 'Sous sous section
un-deux-quatre',
+ 'Subsubsection One-Two-One' => 'Sous sous section
un-deux-un',
+ 'Subsubsection One-Two-Three' => 'Sous sous section
un-deux-trois',
+ 'Subsubsection One-Two-Two' => 'Sous sous section
un-deux-deux',
+ 'T2H_today' => '%2$d %1$s %3$d',
+ 'Table of Contents' => 'Table des address@hidden',
+ 'Table of contents' => 'Table des address@hidden',
+ 'The node you are looking for is at %{href}.' => 'Le
address@hidden que vous recherchez est ici@ : %{href}.',
+ 'This' => 'Ici',
+ 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce
document a @\'address@hidden'e address@hidden'address@hidden'address@hidden'e
le @emph{%{date}} par @emph{%{user}} en utilisant @uref{%{program_homepage},
@emph{%{program}}}.',
+ 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e par
@emph{%{user}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e le
@emph{%{date}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}',
+ 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e en utilisant
@uref{%{program_homepage}, @emph{%{program}}}.',
+ 'Top' => 'Racine',
+ 'Untitled Document' => 'Document sans titre',
+ 'Up' => 'Monter',
+ 'Up node' => 'address@hidden au dessus',
+ 'Up section' => 'Section address@hidden'erieure',
+ 'by @emph{%{user}}' => 'par @emph{%{user}}',
+ 'by @emph{%{user}} on @emph{%{date}}' => 'par
@emph{%{user}} le @emph{%{date}}',
+ 'current' => 'courante',
+ 'on @emph{%{date}}' => 'le @emph{%{date}}',
+ 'section `%{section}\' in @cite{%{book}}' => 'section
`%{section}\' dans @cite{%{book}}',
+ 'see %{node_file_href}' => 'voir %{node_file_href}',
+ 'see %{node_file_href} @cite{%{book}}' => 'voir
%{node_file_href} @cite{%{book}}',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
+ 'see %{reference_name}' => 'voir %{reference_name}',
+ 'see @cite{%{book}}' => 'voir @cite{%{book}}',
+ 'see section %{reference_name}' => 'voir la section
%{reference_name}',
+ 'see section `%{section}\' in @cite{%{book}}' => 'voir
la section `%{section}\' dans @cite{{book}}',
+ 'unknown' => 'inconnu'
+ };
+
+$T2H_OBSOLETE_STRINGS->{'fr'} = {
+ ' This document was generated
%{who_and_when_generated} using %{program_homepage_href}.' => ' Ce document a
été généré %{who_and_when_generated} en
utilisant %{program_homepage_href}.',
+ ' where the <strong> Example </strong>
assumes that the current position is at <strong> Subsubsection One-Two-Three
</strong> of a document of the following structure:' => ' Dans cet exemple on
est à <strong> Sous section un-deux-trois </strong> dans un document
dont la structure est :',
+ '%{node_file_href} section `%{section}\' in
<cite>%{book}</cite>' => '%{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
+ 'See' => 'Voir',
+ 'See %{node_file_href} <cite>%{book}</cite>'
=> 'Voir %{node_file_href} <cite>%{book}</cite>',
+ 'See %{node_file_href} section `%{section}\'
in <cite>%{book}</cite>' => 'Voir %{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
+ 'See <cite>%{book}</cite>' => 'Voir
<cite>%{book}</cite>',
+ 'See section `%{section}\' in
<cite>%{book}</cite>' => 'Voir la section `%{section}\' dans
<cite>%{book}</cite>',
+ 'This document was generated by
<i>%{user}</i> on <i>%{date}</i> using %{program_homepage_href}.' => 'Ce
document a été généré par <i>%{user}</i>
<i>%{date}</i> en utilisant %{program_homepage_href}.',
+ 'This document was generated by
<i>%{user}</i> using %{program_homepage_href}.' => 'Ce document a
été généré par <i>%{user}</i> en utilisant
%{program_homepage_href}.',
+ 'This document was generated by
@emph{%{user}} on @emph{%{date}} using %{program_homepage_href}.' => 'Ce
document a @\'address@hidden'e address@hidden'address@hidden'address@hidden'e
par @emph{%{user}} @emph{%{date}} en utilisant %{program_homepage_href}.',
+ 'This document was generated by
@emph{%{user}} using %{program_homepage_href}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e par
@emph{%{user}} en utilisant %{program_homepage_href}.',
+ 'This document was generated on
<i>%{date}</i> using %{program_homepage_href}.' => 'Ce document a
été généré <i>%{date}</i> en utilisant
%{program_homepage_href}.',
+ 'This document was generated on
@emph{%{date}} using %{program_homepage_href}.' => 'Ce document a
@\'address@hidden'e address@hidden'address@hidden'address@hidden'e
@emph{%{date}} en utilisant %{program_homepage_href}.',
+ 'This document was generated on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce
document a @\'address@hidden'e address@hidden'address@hidden'address@hidden'e
@emph{%{date}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated using
%{program_homepage_href}.' => 'Ce document a @\'address@hidden'e
address@hidden'address@hidden'address@hidden'e en utilisant
%{program_homepage_href}.',
+ 'about (help)' => '@`a propos (page
d\'aide)',
+ 'about (this page)' => 'a propos (cette
page)',
+ 'beginning of this chapter or previous
chapter' => 'address@hidden'ebut de ce chapitre ou chapitre
address@hidden'address@hidden'edent',
+ 'by <i>%{user}</i>' => 'par <i>%{user}</i>',
+ 'by <i>%{user}</i> on <i>%{date}</i>' =>
'par <i>%{user}</i> <i>%{date}</i>',
+ 'concept index' => 'index',
+ 'cover (top) of document' => 'couverture
(top) du document',
+ 'current section' => 'section actuelle',
+ 'first section in reading order' =>
'address@hidden section dans l\'ordre de lecture',
+ 'following node' => 'node suivant',
+ 'index' => 'index',
+ 'last section in reading order' =>
'address@hidden section dans l\'ordre de lecture',
+ 'next chapter' => 'chapitre suivant',
+ 'next node' => 'node suivant',
+ 'next section in reading order' => 'section
suivante dans l\'ordre de lecture',
+ 'next section on same level' => 'section
suivante au address@hidden niveau',
+ 'node following in node reading order' =>
'node suivant dans l\'ordre des nodes',
+ 'node up' => 'node au dessus',
+ 'on <i>%{date}</i>' => '<i>%{date}</i>',
+ 'previous node' => 'node
address@hidden'address@hidden'edent',
+ 'previous section in reading order' =>
'section address@hidden'address@hidden'edente dans l\'ordre de lecture',
+ 'previous section on same level' => 'section
address@hidden'address@hidden'edente au address@hidden niveau',
+ 'section' => 'section',
+ 'section `%{section}\' in
<cite>%{book}</cite>' => 'section `%{section}\' dans <cite>%{book}</cite>',
+ 'see' => 'voir',
+ 'see %{node_file_href} <cite>%{book}</cite>'
=> 'voir %{node_file_href} <cite>%{book}</cite>',
+ 'see %{node_file_href} section `%{section}\'
in <cite>%{book}</cite>' => 'voir %{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
+ 'see <cite>%{book}</cite>' => 'voir
<cite>%{book}</cite>',
+ 'see section `%{section}\' in
<cite>%{book}</cite>' => 'voir la section `%{section}\' dans
<cite>%{book}</cite>',
+ 'short table of contents' => 'table des
address@hidden address@hidden'address@hidden'ee',
+ 'table of contents' => 'table des
address@hidden',
+ 'up node' => 'node au dessus',
+ 'up section' => 'section
address@hidden'erieure'
};
@@ -572,337 +680,183 @@
'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'address@hidden,
@emph{%{program}}}ãç¨ãã¦çæããã¾ããã',
'Top' => 'åé ',
'Untitled Document' => 'ç¡é¡ã®ææ¸',
- 'Up' => '',
- 'Up node' => '',
- 'Up section' => '',
- 'by @emph{%{user}}' => '@emph{%{user}}',
- 'by @emph{%{user}} on @emph{%{date}}' =>
'@emph{%{user}}, @emph{%{date}',
- 'current' => 'ç¾å¨ä½ç½®',
- 'on @emph{%{date}}' => '@emph{%{date}}',
- 'section `%{section}\' in @cite{%{book}}' =>
'@cite{%{book}}ã® `%{section}\' ',
- 'see %{node_file_href}' => '%{node_file_href}åç
§',
- 'see %{node_file_href} @cite{%{book}}' =>
'%{node_file_href} @cite{%{book}}åç
§',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
- 'see %{reference_name}' => '',
- 'see @cite{%{book}}' => '',
- 'see section %{reference_name}' => '',
- 'see section `%{section}\' in @cite{%{book}}' => '',
- 'unknown' => 'ä¸æ'
- };
-
-$T2H_OBSOLETE_STRINGS->{'ja'} = {
- 'about (help)' => '使ç¨æ³ (ãã«ã)',
- 'beginning of this chapter or previous
chapter' => 'ãã®ç« ã¾ãã¯åã®ç« ã®åé ',
- 'cover (top) of document' =>
'ææ¸ã®è¡¨ç´ (ããã)',
- 'current section' => 'ç¾å¨ã®ç¯',
- 'first section in reading order' => 'ææ¸é
ã§åã®é
',
- 'following node' => '次ã®ç¯',
- 'index' => 'è¦åºã',
- 'last section in reading order' => 'ææ¸é
ã§æå¾ã®é
',
- 'next chapter' => '次ã®ç« ',
- 'next node' => '次ã®ç¯',
- 'next section in reading order' => 'ææ¸é
ã§æ¬¡ã®é
',
- 'next section on same level' =>
'åãé層ã«ãã次ã®é
',
- 'node following in node reading order' =>
'ææ¸é ã§æ¬¡ã®ç¯',
- 'node up' => 'ä¸ã®ç¯ã¸',
- 'previous node' => 'åã®ç¯',
- 'previous section in reading order' =>
'ææ¸é ã§åã®ç¯',
- 'previous section on same level' =>
'åãé層ã«ããåã®é
',
- 'short table of contents' =>
'ç°¡ç¥åããç®æ¬¡',
- 'table of contents' => 'ææ¸ã®ç®æ¬¡',
- 'up node' => 'ä¸ã®ç¯',
- 'up section' => 'ä¸ã®é
'
- };
-
-
-$LANGUAGES->{'pt'} = {
- ' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
- ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
- ' Up ' => ' Acima ',
- '%{acronym_like} (%{explanation})' => '',
- '%{month} %{day}, %{year}' => '%{day} de %{month} de
%{year}',
- '%{name} of %{class}' => '%{name} da %{class}',
- '%{name} on %{class}' => '%{name} na %{class}',
- '%{node_file_href}' => '',
- '%{node_file_href} @cite{%{book}}' => '',
- '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
- '%{reference_name}' => '',
- '%{style} %{number}' => '',
- '%{style}: %{caption_first_line}' => '',
- '%{style}: %{shortcaption_first_line}' => '',
- '@b{%{quotation_arg}:} ' => '',
- '@cite{%{book}}' => '',
- 'About' => 'Sobre',
- 'About (help)' => 'Sobre (ajuda)',
- 'About This Document' => 'Sobre Esse Documento',
- 'April' => 'Abril',
- 'August' => 'Agosto',
- 'Back' => 'Volta',
- 'Back section in previous file' => '',
- 'Beginning of this chapter or previous chapter' =>
'Come@,{c}o desse address@hidden'itulo ou address@hidden'itulo anterior',
- 'Button' => 'address@hidden',
- 'Contents' => 'address@hidden'udo',
- 'Cover (top) of document' => 'address@hidden'icio
(topo) do documento',
- 'Current Position' => 'Posi@,address@hidden Atual',
- 'Current section' => 'Se@,address@hidden atual',
- 'December' => 'Dezembro',
- 'FastBack' => 'Voltar address@hidden'apido',
- 'FastForward' => 'Avan@,{c}ar address@hidden'apido',
- 'February' => 'Fevereiro',
- 'First' => 'Primeiro',
- 'First section in reading order' => 'Primeira
se@,address@hidden na ordem de leitura',
- 'Following' => 'Seguinte',
- 'Following node' => 'Nodo seguinte',
- 'Footnotes' => 'Notas de address@hidden'e',
- 'Forward' => 'Avan@,{c}ar',
- 'Forward section in next file' => '',
- 'From 1.2.3 go to' => 'De 1.2.3 address@hidden'a para',
- 'Go to' => 'address@hidden'a para',
- 'Index' => '@\'Indice',
- 'Index Entry' => 'Entrada de @\'Indice',
- 'January' => 'Janeiro',
- 'July' => 'Julho',
- 'Jump to' => 'Pular para',
- 'June' => 'Junho',
- 'Last' => '@\'Ultimo',
- 'Last section in reading order' => '@\'Ultima
se@,address@hidden na ordem de leitura',
- 'March' => 'Mar@,{c}o',
- 'May' => 'Maio',
- 'Menu:' => '',
- 'Name' => 'Nome',
- 'Next' => 'address@hidden'oximo',
- 'Next chapter' => 'address@hidden'oximo
address@hidden'itulo',
- 'Next file' => '',
- 'Next node' => 'address@hidden'oximo nodo',
- 'Next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
- 'Next section on same level' => 'address@hidden'oxima
se@,address@hidden no mesmo address@hidden'ivel',
- 'NextFile' => '',
- 'Node following in node reading order' => 'Nodo
seguinte na ordem de leitura de nodos',
- 'Node up' => 'Nodo acima',
- 'NodeNext' => 'address@hidden'oximo Nodo',
- 'NodePrev' => 'Nodo Anterior',
- 'NodeUp' => 'Nodo Acima',
- 'November' => 'Novembro',
- 'October' => 'Outubro',
- 'Overview' => 'address@hidden geral',
- 'Overview:' => 'address@hidden geral:',
- 'Prev' => 'address@hidden'evio',
- 'PrevFile' => '',
- 'Previous file' => '',
- 'Previous node' => 'Nodo anterior',
- 'Previous section in reading order' =>
'Se@,address@hidden anterior na ordem de leitura',
- 'Previous section on same level' => 'Se@,address@hidden
anterior no mesmo address@hidden'ivel',
- 'Section' => 'Se@,address@hidden',
- 'Section One' => 'Se@,address@hidden Um',
- 'See %{node_file_href}' => 'Veja %{node_file_href}',
- 'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
- 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
- 'See %{reference_name}' => 'Veja %{reference_name}',
- 'See @cite{%{book}}' => 'Veja @cite{%{book}}',
- 'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
- 'See section `%{section}\' in @cite{%{book}}' => 'Veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
- 'September' => 'Setembro',
- 'Short Table of Contents' => 'Breve
address@hidden'ario',
- 'Short table of contents' => 'Breve
address@hidden'ario',
- 'Subsection One-Four' => 'Subse@,address@hidden
Um-Quatro',
- 'Subsection One-One' => 'Subse@,address@hidden Um-Um',
- 'Subsection One-Three' => 'Subse@,address@hidden
address@hidden',
- 'Subsection One-Two' => 'Subse@,address@hidden Um-Dois',
- 'Subsubsection One-Two-Four' => 'Subse@,address@hidden
Um-Dois-Quatro',
- 'Subsubsection One-Two-One' => 'Subse@,address@hidden
Um-Dois-Um',
- 'Subsubsection One-Two-Three' => 'Subse@,address@hidden
address@hidden',
- 'Subsubsection One-Two-Two' => 'Subse@,address@hidden
Um-Dois-Dois',
- 'T2H_today' => '',
- 'Table of Contents' => 'address@hidden'ario',
- 'Table of contents' => 'address@hidden'ario',
- 'The node you are looking for is at %{href}.' => 'O
nodo que address@hidden address@hidden'a olhando address@hidden'a em %{href}.',
- 'This' => 'Esse',
- 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse
documento foi gereado por @emph{%{user}} em @emph{%{date}} usando
@uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
por @emph{%{user}} usando @uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Esse documento foi gerado em
@i{%{date}} usando @uref{%{program_homepage}, @i{%{program}}}.',
- 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
usando @uref{%{program_homepage}, @emph{%{program}}}.',
- 'Top' => 'Topo',
- 'Untitled Document' => 'Documento Sem Nome',
- 'Up' => 'Acima',
- 'Up node' => 'Nodo acima',
- 'Up section' => 'Se@,address@hidden acima',
- 'by @emph{%{user}}' => 'por @emph{%{user}}',
- 'by @emph{%{user}} on @emph{%{date}}' => 'por
@emph{%{user}} em @emph{%{date}}',
- 'current' => 'atual',
- 'on @emph{%{date}}' => 'em @emph{%{date}}',
- 'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
- 'see %{node_file_href}' => 'veja %{node_file_href}',
- 'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
- 'see %{reference_name}' => 'veja %{reference_name}',
- 'see @cite{%{book}}' => 'veja @cite{%{book}}',
- 'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
- 'see section `%{section}\' in @cite{%{book}}' => 'veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
- 'unknown' => 'desconhecido'
- };
-
-$T2H_OBSOLETE_STRINGS->{'pt'} = {
- 'See' => 'Veja',
- 'about (help)' => 'sobre (ajuda)',
- 'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
- 'cover (top) of document' =>
'address@hidden'icio (topo) do documento',
- 'current section' => 'se@,address@hidden
atual',
- 'first section in reading order' =>
'primeira se@,address@hidden na ordem de leitura',
- 'following node' => 'nodo seguinte',
- 'index' => '@\'indice',
- 'last section in reading order' =>
'@\'ultima se@,address@hidden na ordem de leitura',
- 'next chapter' => 'address@hidden'oximo
address@hidden'itulo',
- 'next node' => 'address@hidden'oximo nodo',
- 'next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
- 'next section on same level' =>
'address@hidden'oxima se@,address@hidden no mesmo address@hidden'ivel',
- 'node following in node reading order' =>
'nodo seguinte na ordem de leitura de nodos',
- 'node up' => 'nodo acima',
- 'previous node' => 'nodo anterior',
- 'previous section in reading order' =>
'se@,address@hidden anterior na ordem de leitura',
- 'previous section on same level' =>
'se@,address@hidden anterior no mesmo address@hidden'ivel',
- 'section' => 'Se@,address@hidden',
- 'see' => 'veja',
- 'short table of contents' => 'breve
address@hidden'ario',
- 'table of contents' => 'address@hidden'ario',
- 'up node' => 'nodo acima',
- 'up section' => 'se@,address@hidden acima'
+ 'Up' => '',
+ 'Up node' => '',
+ 'Up section' => '',
+ 'by @emph{%{user}}' => '@emph{%{user}}',
+ 'by @emph{%{user}} on @emph{%{date}}' =>
'@emph{%{user}}, @emph{%{date}',
+ 'current' => 'ç¾å¨ä½ç½®',
+ 'on @emph{%{date}}' => '@emph{%{date}}',
+ 'section `%{section}\' in @cite{%{book}}' =>
'@cite{%{book}}ã® `%{section}\' ',
+ 'see %{node_file_href}' => '%{node_file_href}åç
§',
+ 'see %{node_file_href} @cite{%{book}}' =>
'%{node_file_href} @cite{%{book}}åç
§',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
+ 'see %{reference_name}' => '',
+ 'see @cite{%{book}}' => '',
+ 'see section %{reference_name}' => '',
+ 'see section `%{section}\' in @cite{%{book}}' => '',
+ 'unknown' => 'ä¸æ'
+ };
+
+$T2H_OBSOLETE_STRINGS->{'ja'} = {
+ 'about (help)' => '使ç¨æ³ (ãã«ã)',
+ 'beginning of this chapter or previous
chapter' => 'ãã®ç« ã¾ãã¯åã®ç« ã®åé ',
+ 'cover (top) of document' =>
'ææ¸ã®è¡¨ç´ (ããã)',
+ 'current section' => 'ç¾å¨ã®ç¯',
+ 'first section in reading order' => 'ææ¸é
ã§åã®é
',
+ 'following node' => '次ã®ç¯',
+ 'index' => 'è¦åºã',
+ 'last section in reading order' => 'ææ¸é
ã§æå¾ã®é
',
+ 'next chapter' => '次ã®ç« ',
+ 'next node' => '次ã®ç¯',
+ 'next section in reading order' => 'ææ¸é
ã§æ¬¡ã®é
',
+ 'next section on same level' =>
'åãé層ã«ãã次ã®é
',
+ 'node following in node reading order' =>
'ææ¸é ã§æ¬¡ã®ç¯',
+ 'node up' => 'ä¸ã®ç¯ã¸',
+ 'previous node' => 'åã®ç¯',
+ 'previous section in reading order' =>
'ææ¸é ã§åã®ç¯',
+ 'previous section on same level' =>
'åãé層ã«ããåã®é
',
+ 'short table of contents' =>
'ç°¡ç¥åããç®æ¬¡',
+ 'table of contents' => 'ææ¸ã®ç®æ¬¡',
+ 'up node' => 'ä¸ã®ç¯',
+ 'up section' => 'ä¸ã®é
'
};
-$LANGUAGES->{'de'} = {
- ' The buttons in the navigation panels have the
following meaning:' => ' Die Links in der Navigationsleiste haben die folgende
Bedeutung: ',
- ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' wobei das @strong{ Beispiel } annimmt, dass die
aktuelle Position bei @strong{ Unterabschnitt 1-2-3 } in einem Dokument mit
folgender Struktur liegt:',
- ' Up ' => ' Nach oben ',
- '%{acronym_like} (%{explanation})' => '%{acronym_like}
(%{explanation})',
- '%{month} %{day}, %{year}' => '%{day}. %{month}
%{year}',
+$LANGUAGES->{'nl'} = {
+ ' The buttons in the navigation panels have the
following meaning:' => '',
+ ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
+ ' Up ' => '',
+ '%{acronym_like} (%{explanation})' => '',
+ '%{month} %{day}, %{year}' => '',
'%{name} of %{class}' => '',
'%{name} on %{class}' => '',
'%{node_file_href}' => '',
'%{node_file_href} @cite{%{book}}' => '',
- '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
- '%{reference_name}' => '%{reference_name}',
- '%{style} %{number}' => '%{style} %{number}',
- '%{style}: %{caption_first_line}' => '%{style}:
%{caption_first_line}',
- '%{style}: %{shortcaption_first_line}' => '%{style}:
%{shortcaption_first_line}',
- '@b{%{quotation_arg}:} ' => '@b{%{quotation_arg}:} ',
- '@cite{%{book}}' => '@cite{%{book}}',
- 'About' => '@"Uber',
- 'About (help)' => '@"Uber (Hilfe)',
- 'About This Document' => '@"Uber dieses Dokument',
+ '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
+ '%{reference_name}' => '',
+ '%{style} %{number}' => '',
+ '%{style}: %{caption_first_line}' => '',
+ '%{style}: %{shortcaption_first_line}' => '',
+ '@b{%{quotation_arg}:} ' => '',
+ '@cite{%{book}}' => '',
+ 'About' => '',
+ 'About (help)' => '',
+ 'About This Document' => 'No translation available!',
'April' => 'April',
- 'August' => 'August',
- 'Back' => 'Zur@"uck',
+ 'August' => 'Augustus',
+ 'Back' => '',
'Back section in previous file' => '',
- 'Beginning of this chapter or previous chapter' =>
'Anfang dieses oder des letzten Kapitels',
+ 'Beginning of this chapter or previous chapter' => '',
'Button' => '',
- 'Contents' => 'Inhalt',
- 'Cover (top) of document' => 'Titelseite des Dokuments',
- 'Current Position' => 'Aktuelle Position',
- 'Current section' => 'Aktueller Abschnitt',
- 'December' => 'Dezember',
+ 'Contents' => '',
+ 'Cover (top) of document' => '',
+ 'Current Position' => '',
+ 'Current section' => '',
+ 'December' => 'December',
'FastBack' => '',
'FastForward' => '',
- 'February' => 'Februar',
+ 'February' => 'Februari',
'First' => '',
- 'First section in reading order' => 'Erster Abschnitt
in Lesereihenfolge',
+ 'First section in reading order' => '',
'Following' => '',
- 'Following node' => 'N@"achster Knoten',
- 'Footnotes' => 'address@hidden',
- 'Forward' => 'Nach vorne',
+ 'Following node' => '',
+ 'Footnotes' => 'No translation available!',
+ 'Forward' => '',
'Forward section in next file' => '',
- 'From 1.2.3 go to' => 'Von 1.2.3 gehe zu',
- 'Go to' => 'Gehe zu',
+ 'From 1.2.3 go to' => '',
+ 'Go to' => '',
'Index' => 'Index',
- 'Index Entry' => 'Indexeintrag',
- 'January' => 'Januar',
+ 'Index Entry' => '',
+ 'January' => 'Januari',
'July' => 'Juli',
- 'Jump to' => 'Springe zu',
+ 'Jump to' => '',
'June' => 'Juni',
'Last' => '',
- 'Last section in reading order' => 'Letzter Abschnitt
in Lesereihenfolge',
- 'March' => 'M@"arz',
- 'May' => 'Mai',
- 'Menu:' => 'Auswahl:',
- 'Name' => 'Name',
+ 'Last section in reading order' => '',
+ 'March' => 'Maart',
+ 'May' => 'Mei',
+ 'Menu:' => '',
+ 'Name' => '',
'Next' => '',
- 'Next chapter' => 'N@"achstes Kapitel',
+ 'Next chapter' => '',
'Next file' => '',
- 'Next node' => 'N@"achster Knoten',
- 'Next section in reading order' => 'N@"achster
Abschnitt in Lesereihenfolge',
- 'Next section on same level' => 'N@"achster Abschitt
derselben Ebene',
+ 'Next node' => '',
+ 'Next section in reading order' => '',
+ 'Next section on same level' => '',
'NextFile' => '',
- 'Node following in node reading order' => 'N@"achster
Abschnitt in Lesereihenfolge',
- 'Node up' => 'Knoten nach oben',
+ 'Node following in node reading order' => '',
+ 'Node up' => '',
'NodeNext' => '',
'NodePrev' => '',
'NodeUp' => '',
'November' => 'November',
'October' => 'Oktober',
- 'Overview' => '@"Ubersicht',
- 'Overview:' => '@"Ubersicht:',
+ 'Overview' => '',
+ 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
- 'Previous node' => 'Voriger Knoten',
- 'Previous section in reading order' => 'Voriger
Abschnitt in Lesereihenfolge',
- 'Previous section on same level' => 'Voriger Abschnitt
derselben Ebene',
- 'Section' => 'Abschnitt',
- 'Section One' => 'Abschnitt 1',
- 'See %{node_file_href}' => 'Siehe %{node_file_href}',
- 'See %{node_file_href} @cite{%{book}}' => 'Siehe
%{node_file_href} @cite{%{book}}',
- 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Siehe %{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
+ 'Previous node' => '',
+ 'Previous section in reading order' => '',
+ 'Previous section on same level' => '',
+ 'Section' => '',
+ 'Section One' => '',
+ 'See %{node_file_href}' => '',
+ 'See %{node_file_href} @cite{%{book}}' => '',
+ 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
- 'See section `%{section}\' in @cite{%{book}}' => 'Siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'See section `%{section}\' in @cite{%{book}}' => '',
'September' => 'September',
- 'Short Table of Contents' => 'Kurzes
Inhaltsverzeichnis',
- 'Short table of contents' => 'Kurzes
Inhaltsverzeichnis',
- 'Subsection One-Four' => 'Unterabschnitt 1-4',
- 'Subsection One-One' => 'Unterabschnitt 1-1',
- 'Subsection One-Three' => 'Unterabschnitt 1-3',
- 'Subsection One-Two' => 'Unterabschnitt 1-2',
- 'Subsubsection One-Two-Four' => 'Unterabschnitt 1-2-4',
- 'Subsubsection One-Two-One' => 'Unterabschnitt 1-2-1',
- 'Subsubsection One-Two-Three' => 'Unterabschnitt 1-2-3',
- 'Subsubsection One-Two-Two' => 'Unterabschnitt 1-2-2',
+ 'Short Table of Contents' => 'Korte inhoudsopgave',
+ 'Short table of contents' => '',
+ 'Subsection One-Four' => '',
+ 'Subsection One-One' => '',
+ 'Subsection One-Three' => '',
+ 'Subsection One-Two' => '',
+ 'Subsubsection One-Two-Four' => '',
+ 'Subsubsection One-Two-One' => '',
+ 'Subsubsection One-Two-Three' => '',
+ 'Subsubsection One-Two-Two' => '',
'T2H_today' => '',
- 'Table of Contents' => 'Inhaltsverzeichnis',
- 'Table of contents' => 'Inhaltsverzeichnis',
- 'The node you are looking for is at %{href}.' => 'Der
Knoten, den Sie sehen, befindet sich bei %{href}',
+ 'Table of Contents' => 'Inhoudsopgave',
+ 'Table of contents' => '',
+ 'The node you are looking for is at %{href}.' => '',
'This' => '',
- 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Dieses
Dokument wurde erzeugt von @emph{%{user}} am @emph{%{date}} durch
@uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Dieses Dokument wurde
erzeugt von @emph{%{user}} durch @uref{%{program_homepage},
@emph{%{program}}}.',
- 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Dieses Dokument wurde erzeugt
am @i{%{date}} durch @uref{%{program_homepage}, @i{%{program}}}.',
- 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Dieses Dokument wurde
erzeugt durch @uref{%{program_homepage}, @emph{%{program}}}.',
- 'Top' => 'Anfang',
- 'Untitled Document' => 'Unbenanntes Dokumen',
- 'Up' => 'Nach oben',
- 'Up node' => 'Knoten nach oben',
- 'Up section' => 'Abschnitt nach oben',
- 'by @emph{%{user}}' => 'von @emph{%{user}}',
- 'by @emph{%{user}} on @emph{%{date}}' => 'von
@emph{%{user}} am @emph{%{date}}',
+ 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
+ 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => '',
+ 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => '',
+ 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => '',
+ 'Top' => '',
+ 'Untitled Document' => '',
+ 'Up' => '',
+ 'Up node' => '',
+ 'Up section' => '',
+ 'by @emph{%{user}}' => '',
+ 'by @emph{%{user}} on @emph{%{date}}' => '',
'current' => '',
- 'on @emph{%{date}}' => 'am @emph{%{date}}',
- 'section `%{section}\' in @cite{%{book}}' => 'Abschnitt
`%{section}\' in @cite{%{book}}',
- 'see %{node_file_href}' => 'siehe %{node_file_href}',
- 'see %{node_file_href} @cite{%{book}}' => 'siehe
%{node_file_href} @cite{%{book}}',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'siehe %{node_file_href} im Abschnitt `%{section}\' in
@cite{%{book}}',
- 'see %{reference_name}' => 'siehe %{reference_name}',
- 'see @cite{%{book}}' => 'siehe @cite{%{book}}',
- 'see section %{reference_name}' => 'siehe Abschnitt
%{reference_name}',
- 'see section `%{section}\' in @cite{%{book}}' => 'siehe
Abschnitt `%{section}\' in @cite{%{book}}',
- 'unknown' => 'unbekannt'
+ 'on @emph{%{date}}' => '',
+ 'section `%{section}\' in @cite{%{book}}' => '',
+ 'see %{node_file_href}' => '',
+ 'see %{node_file_href} @cite{%{book}}' => '',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
+ 'see %{reference_name}' => '',
+ 'see @cite{%{book}}' => '',
+ 'see section %{reference_name}' => '',
+ 'see section `%{section}\' in @cite{%{book}}' => '',
+ 'unknown' => ''
};
-$T2H_OBSOLETE_STRINGS->{'de'} = {
- 'See' => 'Siehe',
- 'section' => 'Abschnitt',
- 'see' => 'siehe'
+$T2H_OBSOLETE_STRINGS->{'nl'} = {
+ 'See' => 'Zie',
+ 'section' => 'sectie',
+ 'see' => 'zie'
};
-$LANGUAGES->{'en'} = {
+$LANGUAGES->{'no'} = {
' The buttons in the navigation panels have the
following meaning:' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
@@ -921,9 +875,9 @@
'@cite{%{book}}' => '',
'About' => '',
'About (help)' => '',
- 'About This Document' => '',
- 'April' => '',
- 'August' => '',
+ 'About This Document' => 'No translation available!',
+ 'April' => 'april',
+ 'August' => 'august',
'Back' => '',
'Back section in previous file' => '',
'Beginning of this chapter or previous chapter' => '',
@@ -932,29 +886,29 @@
'Cover (top) of document' => '',
'Current Position' => '',
'Current section' => '',
- 'December' => '',
+ 'December' => 'desember',
'FastBack' => '',
'FastForward' => '',
- 'February' => '',
+ 'February' => 'februar',
'First' => '',
'First section in reading order' => '',
'Following' => '',
'Following node' => '',
- 'Footnotes' => '',
+ 'Footnotes' => 'No translation available!',
'Forward' => '',
'Forward section in next file' => '',
'From 1.2.3 go to' => '',
'Go to' => '',
- 'Index' => '',
+ 'Index' => 'Indeks',
'Index Entry' => '',
- 'January' => '',
- 'July' => '',
+ 'January' => 'januar',
+ 'July' => 'juli',
'Jump to' => '',
- 'June' => '',
+ 'June' => 'juni',
'Last' => '',
'Last section in reading order' => '',
- 'March' => '',
- 'May' => '',
+ 'March' => 'mars',
+ 'May' => 'mai',
'Menu:' => '',
'Name' => '',
'Next' => '',
@@ -969,8 +923,8 @@
'NodeNext' => '',
'NodePrev' => '',
'NodeUp' => '',
- 'November' => '',
- 'October' => '',
+ 'November' => 'november',
+ 'October' => 'oktober',
'Overview' => '',
'Overview:' => '',
'Prev' => '',
@@ -988,8 +942,8 @@
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
- 'September' => '',
- 'Short Table of Contents' => '',
+ 'September' => 'september',
+ 'Short Table of Contents' => 'Kort innholdsfortegnelse',
'Short table of contents' => '',
'Subsection One-Four' => '',
'Subsection One-One' => '',
@@ -999,8 +953,8 @@
'Subsubsection One-Two-One' => '',
'Subsubsection One-Two-Three' => '',
'Subsubsection One-Two-Two' => '',
- 'T2H_today' => '%s, %d %d',
- 'Table of Contents' => '',
+ 'T2H_today' => '',
+ 'Table of Contents' => 'Innholdsfortegnelse',
'Table of contents' => '',
'The node you are looking for is at %{href}.' => '',
'This' => '',
@@ -1028,272 +982,318 @@
'unknown' => ''
};
-$T2H_OBSOLETE_STRINGS->{'en'} = {};
+$T2H_OBSOLETE_STRINGS->{'no'} = {
+ 'See' => 'Se',
+ 'section' => 'avsnitt',
+ 'see' => 'se'
+ };
-$LANGUAGES->{'es'} = {
- ' The buttons in the navigation panels have the
following meaning:' => ' Los botones de los paneles de address@hidden'on
tienen el significado siguiente:',
- ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' donde el @strong{ Ejemplo } supone que la
posición actual está en la @strong{ address@hidden'on uno-dos-tres } de un
documento de la estructura siguiente:',
- ' Up ' => ' Subir ',
+$LANGUAGES->{'pt'} = {
+ ' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
+ ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
+ ' Up ' => ' Acima ',
'%{acronym_like} (%{explanation})' => '',
- '%{month} %{day}, %{year}' => 'el %{day} %{month}
%{year}',
- '%{name} of %{class}' => '%{name} de %{class}',
- '%{name} on %{class}' => '%{name} en %{class}',
+ '%{month} %{day}, %{year}' => '%{day} de %{month} de
%{year}',
+ '%{name} of %{class}' => '%{name} da %{class}',
+ '%{name} on %{class}' => '%{name} na %{class}',
'%{node_file_href}' => '',
'%{node_file_href} @cite{%{book}}' => '',
- '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} address@hidden'on `%{section}\' en
@cite{%{book}}',
+ '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'%{reference_name}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
- 'About' => 'Acerca de',
- 'About (help)' => 'Acerca de (address@hidden'agina de
ayuda)',
- 'About This Document' => 'Acerca de este documento',
- 'April' => 'abril',
- 'August' => 'agosto',
- 'Back' => 'address@hidden'as',
- 'Back section in previous file' => 'Retroceder
address@hidden'on en el archivo anterior',
- 'Beginning of this chapter or previous chapter' =>
'Inicio de este address@hidden'itulo o address@hidden'itulo anterior',
- 'Button' => 'address@hidden'on',
- 'Contents' => '@\'Indice general',
- 'Cover (top) of document' => 'Portada del documento',
- 'Current Position' => 'address@hidden'on actual',
- 'Current section' => 'address@hidden'on actual',
- 'December' => 'diciembre',
- 'FastBack' => 'Retroceso address@hidden'apido',
- 'FastForward' => 'Avance address@hidden'apido',
- 'February' => 'febrero',
- 'First' => 'Primero',
- 'First section in reading order' => 'Primera
address@hidden'on en orden de lectura',
- 'Following' => 'Siguiente',
- 'Following node' => 'Nodo siguiente',
- 'Footnotes' => 'Notas el pie',
- 'Forward' => 'Adelante',
- 'Forward section in next file' => 'Avanzar
address@hidden'on en el address@hidden'oximo archivo',
- 'From 1.2.3 go to' => 'Desde 1.2.3 ir a',
- 'Go to' => 'Ir a',
+ 'About' => 'Sobre',
+ 'About (help)' => 'Sobre (ajuda)',
+ 'About This Document' => 'Sobre Esse Documento',
+ 'April' => 'Abril',
+ 'August' => 'Agosto',
+ 'Back' => 'Volta',
+ 'Back section in previous file' => '',
+ 'Beginning of this chapter or previous chapter' =>
'Come@,{c}o desse address@hidden'itulo ou address@hidden'itulo anterior',
+ 'Button' => 'address@hidden',
+ 'Contents' => 'address@hidden'udo',
+ 'Cover (top) of document' => 'address@hidden'icio
(topo) do documento',
+ 'Current Position' => 'Posi@,address@hidden Atual',
+ 'Current section' => 'Se@,address@hidden atual',
+ 'December' => 'Dezembro',
+ 'FastBack' => 'Voltar address@hidden'apido',
+ 'FastForward' => 'Avan@,{c}ar address@hidden'apido',
+ 'February' => 'Fevereiro',
+ 'First' => 'Primeiro',
+ 'First section in reading order' => 'Primeira
se@,address@hidden na ordem de leitura',
+ 'Following' => 'Seguinte',
+ 'Following node' => 'Nodo seguinte',
+ 'Footnotes' => 'Notas de address@hidden'e',
+ 'Forward' => 'Avan@,{c}ar',
+ 'Forward section in next file' => '',
+ 'From 1.2.3 go to' => 'De 1.2.3 address@hidden'a para',
+ 'Go to' => 'address@hidden'a para',
'Index' => '@\'Indice',
- 'Index Entry' => 'Entrada de @\'indice',
- 'January' => 'enero',
- 'July' => 'julio',
- 'Jump to' => 'Saltar a',
- 'June' => 'junio',
+ 'Index Entry' => 'Entrada de @\'Indice',
+ 'January' => 'Janeiro',
+ 'July' => 'Julho',
+ 'Jump to' => 'Pular para',
+ 'June' => 'Junho',
'Last' => '@\'Ultimo',
- 'Last section in reading order' => '@\'Ultima
address@hidden'on en orden de lectura',
- 'March' => 'marzo',
- 'May' => 'mayo',
- 'Menu:' => 'address@hidden'u:',
- 'Name' => 'Nombre',
- 'Next' => 'Siguiente',
- 'Next chapter' => 'address@hidden'itulo siguiente',
- 'Next file' => 'Archivo siguiente',
- 'Next node' => 'Nodo siguiente',
- 'Next section in reading order' => 'address@hidden'on
siguiente en orden de lectura',
- 'Next section on same level' => 'address@hidden'on
siguiente en el mismo nivel',
- 'NextFile' => 'ArchivoSiguiente',
- 'Node following in node reading order' => 'Nodo
siguiente en orden de lectura de nodos',
- 'Node up' => 'Subir nodo',
- 'NodeNext' => 'NodoSiguiente',
- 'NodePrev' => 'NodoAnterior',
- 'NodeUp' => 'SubirNodo',
- 'November' => 'noviembre',
- 'October' => 'octubre',
- 'Overview' => 'address@hidden'amica',
- 'Overview:' => 'address@hidden'amica:',
- 'Prev' => 'Ant',
- 'PrevFile' => 'ArchivoAnt',
- 'Previous file' => 'Archivo anterior',
+ 'Last section in reading order' => '@\'Ultima
se@,address@hidden na ordem de leitura',
+ 'March' => 'Mar@,{c}o',
+ 'May' => 'Maio',
+ 'Menu:' => '',
+ 'Name' => 'Nome',
+ 'Next' => 'address@hidden'oximo',
+ 'Next chapter' => 'address@hidden'oximo
address@hidden'itulo',
+ 'Next file' => '',
+ 'Next node' => 'address@hidden'oximo nodo',
+ 'Next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
+ 'Next section on same level' => 'address@hidden'oxima
se@,address@hidden no mesmo address@hidden'ivel',
+ 'NextFile' => '',
+ 'Node following in node reading order' => 'Nodo
seguinte na ordem de leitura de nodos',
+ 'Node up' => 'Nodo acima',
+ 'NodeNext' => 'address@hidden'oximo Nodo',
+ 'NodePrev' => 'Nodo Anterior',
+ 'NodeUp' => 'Nodo Acima',
+ 'November' => 'Novembro',
+ 'October' => 'Outubro',
+ 'Overview' => 'address@hidden geral',
+ 'Overview:' => 'address@hidden geral:',
+ 'Prev' => 'address@hidden'evio',
+ 'PrevFile' => '',
+ 'Previous file' => '',
'Previous node' => 'Nodo anterior',
- 'Previous section in reading order' =>
'address@hidden'on anterior en orden de lectura',
- 'Previous section on same level' => 'address@hidden'on
anterior en el mismo nivel',
- 'Section' => 'address@hidden'on',
- 'Section One' => 'address@hidden'on Uno',
- 'See %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
- 'See %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
- 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
- 'See %{reference_name}' => 'address@hidden'ease
%{reference_name}',
- 'See @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
- 'See section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
- 'See section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
- 'September' => 'septiembre',
- 'Short Table of Contents' => 'Resumen del Contenido',
- 'Short table of contents' => 'Resumen del contenido',
- 'Subsection One-Four' => 'address@hidden'on uno-cuatro',
- 'Subsection One-One' => 'address@hidden'on uno-uno',
- 'Subsection One-Three' => 'address@hidden'on uno-tres',
- 'Subsection One-Two' => 'address@hidden'on uno-dos',
- 'Subsubsection One-Two-Four' => 'address@hidden'on
uno-dos-cuatro',
- 'Subsubsection One-Two-One' => 'address@hidden'on
uno-dos-uno',
- 'Subsubsection One-Two-Three' => 'address@hidden'on
uno-dos-tres',
- 'Subsubsection One-Two-Two' => 'address@hidden'on
uno-dos-dos',
- 'T2H_today' => '%2$d %1$s %3$d',
- 'Table of Contents' => '@\'address@hidden General',
- 'Table of contents' => '@\'address@hidden general',
- 'The node you are looking for is at %{href}.' => 'El
nodo que busca se encuentra en %{href}.',
- 'This' => 'Este',
- 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Este
documento ha sido generado por @emph{%{user}} el @emph{%{date}} utilizando
@uref{%{program_homepage}, @emph{%{program}}}.',
- 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Este documento ha sido
generado por @emph{%{user}} utilizando @uref{%{program_homepage},
@emph{%{program}}}.',
- 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Este documento se generó el
@i{%{date}} utilizando @uref{%{program_homepage}, @i{%{program}}}.',
- 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Este documento se generó
utilizando @uref{%{program_homepage}, @emph{%{program}}}.',
- 'Top' => 'Arriba',
- 'Untitled Document' => 'Documento sin
address@hidden'itulo',
- 'Up' => 'Subir',
- 'Up node' => 'Subir nodo',
- 'Up section' => 'Subir address@hidden'on',
- 'by @emph{%{user}}' => 'por @emph{%{user}',
- 'by @emph{%{user}} on @emph{%{date}}' => 'por
@emph{%{user}} el @emph{%{date}}',
- 'current' => 'actual',
- 'on @emph{%{date}}' => 'el @emph{%{date}}',
- 'section `%{section}\' in @cite{%{book}}' =>
'address@hidden'on `%{section}\' en @cite{%{book}}',
- 'see %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
- 'see %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
- 'see %{reference_name}' => 'address@hidden'ease
%{reference_name}',
- 'see @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
- 'see section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
- 'see section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
- 'unknown' => 'desconocido'
+ 'Previous section in reading order' =>
'Se@,address@hidden anterior na ordem de leitura',
+ 'Previous section on same level' => 'Se@,address@hidden
anterior no mesmo address@hidden'ivel',
+ 'Section' => 'Se@,address@hidden',
+ 'Section One' => 'Se@,address@hidden Um',
+ 'See %{node_file_href}' => 'Veja %{node_file_href}',
+ 'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
+ 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
+ 'See %{reference_name}' => 'Veja %{reference_name}',
+ 'See @cite{%{book}}' => 'Veja @cite{%{book}}',
+ 'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
+ 'See section `%{section}\' in @cite{%{book}}' => 'Veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'September' => 'Setembro',
+ 'Short Table of Contents' => 'Breve
address@hidden'ario',
+ 'Short table of contents' => 'Breve
address@hidden'ario',
+ 'Subsection One-Four' => 'Subse@,address@hidden
Um-Quatro',
+ 'Subsection One-One' => 'Subse@,address@hidden Um-Um',
+ 'Subsection One-Three' => 'Subse@,address@hidden
address@hidden',
+ 'Subsection One-Two' => 'Subse@,address@hidden Um-Dois',
+ 'Subsubsection One-Two-Four' => 'Subse@,address@hidden
Um-Dois-Quatro',
+ 'Subsubsection One-Two-One' => 'Subse@,address@hidden
Um-Dois-Um',
+ 'Subsubsection One-Two-Three' => 'Subse@,address@hidden
address@hidden',
+ 'Subsubsection One-Two-Two' => 'Subse@,address@hidden
Um-Dois-Dois',
+ 'T2H_today' => '',
+ 'Table of Contents' => 'address@hidden'ario',
+ 'Table of contents' => 'address@hidden'ario',
+ 'The node you are looking for is at %{href}.' => 'O
nodo que address@hidden address@hidden'a olhando address@hidden'a em %{href}.',
+ 'This' => 'Esse',
+ 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse
documento foi gereado por @emph{%{user}} em @emph{%{date}} usando
@uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
por @emph{%{user}} usando @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Esse documento foi gerado em
@i{%{date}} usando @uref{%{program_homepage}, @i{%{program}}}.',
+ 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
usando @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'Top' => 'Topo',
+ 'Untitled Document' => 'Documento Sem Nome',
+ 'Up' => 'Acima',
+ 'Up node' => 'Nodo acima',
+ 'Up section' => 'Se@,address@hidden acima',
+ 'by @emph{%{user}}' => 'por @emph{%{user}}',
+ 'by @emph{%{user}} on @emph{%{date}}' => 'por
@emph{%{user}} em @emph{%{date}}',
+ 'current' => 'atual',
+ 'on @emph{%{date}}' => 'em @emph{%{date}}',
+ 'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'see %{node_file_href}' => 'veja %{node_file_href}',
+ 'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
+ 'see %{reference_name}' => 'veja %{reference_name}',
+ 'see @cite{%{book}}' => 'veja @cite{%{book}}',
+ 'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
+ 'see section `%{section}\' in @cite{%{book}}' => 'veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'unknown' => 'desconhecido'
};
-$T2H_OBSOLETE_STRINGS->{'es'} = {
- 'See' => 'address@hidden'ease',
- 'section' => 'address@hidden'on',
- 'see' => 'address@hidden'ease'
+$T2H_OBSOLETE_STRINGS->{'pt'} = {
+ 'See' => 'Veja',
+ 'about (help)' => 'sobre (ajuda)',
+ 'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
+ 'cover (top) of document' =>
'address@hidden'icio (topo) do documento',
+ 'current section' => 'se@,address@hidden
atual',
+ 'first section in reading order' =>
'primeira se@,address@hidden na ordem de leitura',
+ 'following node' => 'nodo seguinte',
+ 'index' => '@\'indice',
+ 'last section in reading order' =>
'@\'ultima se@,address@hidden na ordem de leitura',
+ 'next chapter' => 'address@hidden'oximo
address@hidden'itulo',
+ 'next node' => 'address@hidden'oximo nodo',
+ 'next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
+ 'next section on same level' =>
'address@hidden'oxima se@,address@hidden no mesmo address@hidden'ivel',
+ 'node following in node reading order' =>
'nodo seguinte na ordem de leitura de nodos',
+ 'node up' => 'nodo acima',
+ 'previous node' => 'nodo anterior',
+ 'previous section in reading order' =>
'se@,address@hidden anterior na ordem de leitura',
+ 'previous section on same level' =>
'se@,address@hidden anterior no mesmo address@hidden'ivel',
+ 'section' => 'Se@,address@hidden',
+ 'see' => 'veja',
+ 'short table of contents' => 'breve
address@hidden'ario',
+ 'table of contents' => 'address@hidden'ario',
+ 'up node' => 'nodo acima',
+ 'up section' => 'se@,address@hidden acima'
};
-$LANGUAGES->{'no'} = {
- ' The buttons in the navigation panels have the
following meaning:' => '',
- ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
- ' Up ' => '',
+$LANGUAGES->{'pt_BR'} = {
+ ' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
+ ' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
+ ' Up ' => ' Acima ',
'%{acronym_like} (%{explanation})' => '',
- '%{month} %{day}, %{year}' => '',
- '%{name} of %{class}' => '',
- '%{name} on %{class}' => '',
+ '%{month} %{day}, %{year}' => '%{day} de %{month} de
%{year}',
+ '%{name} of %{class}' => '%{name} da %{class}',
+ '%{name} on %{class}' => '%{name} na %{class}',
'%{node_file_href}' => '',
'%{node_file_href} @cite{%{book}}' => '',
- '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
+ '%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'%{reference_name}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
- 'About' => '',
- 'About (help)' => '',
- 'About This Document' => 'No translation available!',
- 'April' => 'april',
- 'August' => 'august',
- 'Back' => '',
+ 'About' => 'Sobre',
+ 'About (help)' => 'Sobre (ajuda)',
+ 'About This Document' => 'Sobre Esse Documento',
+ 'April' => 'Abril',
+ 'August' => 'Agosto',
+ 'Back' => 'Volta',
'Back section in previous file' => '',
- 'Beginning of this chapter or previous chapter' => '',
- 'Button' => '',
- 'Contents' => '',
- 'Cover (top) of document' => '',
- 'Current Position' => '',
- 'Current section' => '',
- 'December' => 'desember',
- 'FastBack' => '',
- 'FastForward' => '',
- 'February' => 'februar',
- 'First' => '',
- 'First section in reading order' => '',
- 'Following' => '',
- 'Following node' => '',
- 'Footnotes' => 'No translation available!',
- 'Forward' => '',
+ 'Beginning of this chapter or previous chapter' =>
'Come@,{c}o desse address@hidden'itulo ou address@hidden'itulo anterior',
+ 'Button' => 'address@hidden',
+ 'Contents' => 'address@hidden'udo',
+ 'Cover (top) of document' => 'address@hidden'icio
(topo) do documento',
+ 'Current Position' => 'Posi@,address@hidden Atual',
+ 'Current section' => 'Se@,address@hidden atual',
+ 'December' => 'Dezembro',
+ 'FastBack' => 'Voltar address@hidden'apido',
+ 'FastForward' => 'Avan@,{c}ar address@hidden'apido',
+ 'February' => 'Fevereiro',
+ 'First' => 'Primeiro',
+ 'First section in reading order' => 'Primeira
se@,address@hidden na ordem de leitura',
+ 'Following' => 'Seguinte',
+ 'Following node' => 'Nodo seguinte',
+ 'Footnotes' => 'Notas de address@hidden'e',
+ 'Forward' => 'Avan@,{c}ar',
'Forward section in next file' => '',
- 'From 1.2.3 go to' => '',
- 'Go to' => '',
- 'Index' => 'Indeks',
- 'Index Entry' => '',
- 'January' => 'januar',
- 'July' => 'juli',
- 'Jump to' => '',
- 'June' => 'juni',
- 'Last' => '',
- 'Last section in reading order' => '',
- 'March' => 'mars',
- 'May' => 'mai',
+ 'From 1.2.3 go to' => 'De 1.2.3 address@hidden'a
para',
+ 'Go to' => 'address@hidden'a para',
+ 'Index' => '@\'Indice',
+ 'Index Entry' => 'Entrada de @\'Indice',
+ 'January' => 'Janeiro',
+ 'July' => 'Julho',
+ 'Jump to' => 'Pular para',
+ 'June' => 'Junho',
+ 'Last' => '@\'Ultimo',
+ 'Last section in reading order' => '@\'Ultima
se@,address@hidden na ordem de leitura',
+ 'March' => 'Mar@,{c}o',
+ 'May' => 'Maio',
'Menu:' => '',
- 'Name' => '',
- 'Next' => '',
- 'Next chapter' => '',
+ 'Name' => 'Nome',
+ 'Next' => 'address@hidden'oximo',
+ 'Next chapter' => 'address@hidden'oximo
address@hidden'itulo',
'Next file' => '',
- 'Next node' => '',
- 'Next section in reading order' => '',
- 'Next section on same level' => '',
+ 'Next node' => 'address@hidden'oximo nodo',
+ 'Next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
+ 'Next section on same level' =>
'address@hidden'oxima se@,address@hidden no mesmo address@hidden'ivel',
'NextFile' => '',
- 'Node following in node reading order' => '',
- 'Node up' => '',
- 'NodeNext' => '',
- 'NodePrev' => '',
- 'NodeUp' => '',
- 'November' => 'november',
- 'October' => 'oktober',
- 'Overview' => '',
- 'Overview:' => '',
- 'Prev' => '',
+ 'Node following in node reading order' => 'Nodo
seguinte na ordem de leitura de nodos',
+ 'Node up' => 'Nodo acima',
+ 'NodeNext' => 'address@hidden'oximo Nodo',
+ 'NodePrev' => 'Nodo Anterior',
+ 'NodeUp' => 'Nodo Acima',
+ 'November' => 'Novembro',
+ 'October' => 'Outubro',
+ 'Overview' => 'address@hidden geral',
+ 'Overview:' => 'address@hidden geral:',
+ 'Prev' => 'address@hidden'evio',
'PrevFile' => '',
'Previous file' => '',
- 'Previous node' => '',
- 'Previous section in reading order' => '',
- 'Previous section on same level' => '',
- 'Section' => '',
- 'Section One' => '',
- 'See %{node_file_href}' => '',
- 'See %{node_file_href} @cite{%{book}}' => '',
- 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
- 'See %{reference_name}' => '',
- 'See @cite{%{book}}' => '',
- 'See section %{reference_name}' => '',
- 'See section `%{section}\' in @cite{%{book}}' => '',
- 'September' => 'september',
- 'Short Table of Contents' => 'Kort innholdsfortegnelse',
- 'Short table of contents' => '',
- 'Subsection One-Four' => '',
- 'Subsection One-One' => '',
- 'Subsection One-Three' => '',
- 'Subsection One-Two' => '',
- 'Subsubsection One-Two-Four' => '',
- 'Subsubsection One-Two-One' => '',
- 'Subsubsection One-Two-Three' => '',
- 'Subsubsection One-Two-Two' => '',
+ 'Previous node' => 'Nodo anterior',
+ 'Previous section in reading order' =>
'Se@,address@hidden anterior na ordem de leitura',
+ 'Previous section on same level' =>
'Se@,address@hidden anterior no mesmo address@hidden'ivel',
+ 'Section' => 'Se@,address@hidden',
+ 'Section One' => 'Se@,address@hidden Um',
+ 'See %{node_file_href}' => 'Veja %{node_file_href}',
+ 'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
+ 'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
+ 'See %{reference_name}' => 'Veja %{reference_name}',
+ 'See @cite{%{book}}' => 'Veja @cite{%{book}}',
+ 'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
+ 'See section `%{section}\' in @cite{%{book}}' =>
'Veja se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'September' => 'Setembro',
+ 'Short Table of Contents' => 'Breve
address@hidden'ario',
+ 'Short table of contents' => 'Breve
address@hidden'ario',
+ 'Subsection One-Four' => 'Subse@,address@hidden
Um-Quatro',
+ 'Subsection One-One' => 'Subse@,address@hidden
Um-Um',
+ 'Subsection One-Three' => 'Subse@,address@hidden
address@hidden',
+ 'Subsection One-Two' => 'Subse@,address@hidden
Um-Dois',
+ 'Subsubsection One-Two-Four' =>
'Subse@,address@hidden Um-Dois-Quatro',
+ 'Subsubsection One-Two-One' =>
'Subse@,address@hidden Um-Dois-Um',
+ 'Subsubsection One-Two-Three' =>
'Subse@,address@hidden address@hidden',
+ 'Subsubsection One-Two-Two' =>
'Subse@,address@hidden Um-Dois-Dois',
'T2H_today' => '',
- 'Table of Contents' => 'Innholdsfortegnelse',
- 'Table of contents' => '',
- 'The node you are looking for is at %{href}.' => '',
- 'This' => '',
- 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
- 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => '',
- 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => '',
- 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => '',
- 'Top' => '',
- 'Untitled Document' => '',
- 'Up' => '',
- 'Up node' => '',
- 'Up section' => '',
- 'by @emph{%{user}}' => '',
- 'by @emph{%{user}} on @emph{%{date}}' => '',
- 'current' => '',
- 'on @emph{%{date}}' => '',
- 'section `%{section}\' in @cite{%{book}}' => '',
- 'see %{node_file_href}' => '',
- 'see %{node_file_href} @cite{%{book}}' => '',
- 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
- 'see %{reference_name}' => '',
- 'see @cite{%{book}}' => '',
- 'see section %{reference_name}' => '',
- 'see section `%{section}\' in @cite{%{book}}' => '',
- 'unknown' => ''
+ 'Table of Contents' => 'address@hidden'ario',
+ 'Table of contents' => 'address@hidden'ario',
+ 'The node you are looking for is at %{href}.' => 'O
nodo que address@hidden address@hidden'a olhando address@hidden'a em %{href}.',
+ 'This' => 'Esse',
+ 'This document was generated by @emph{%{user}} on
@emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse
documento foi gereado por @emph{%{user}} em @emph{%{date}} usando
@uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated by @emph{%{user}} using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
por @emph{%{user}} usando @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'This document was generated on @i{%{date}} using
@uref{%{program_homepage}, @i{%{program}}}.' => 'Esse documento foi gerado em
@i{%{date}} usando @uref{%{program_homepage}, @i{%{program}}}.',
+ 'This document was generated using
@uref{%{program_homepage}, @emph{%{program}}}.' => 'Esse documento foi gerado
usando @uref{%{program_homepage}, @emph{%{program}}}.',
+ 'Top' => 'Topo',
+ 'Untitled Document' => 'Documento Sem Nome',
+ 'Up' => 'Acima',
+ 'Up node' => 'Nodo acima',
+ 'Up section' => 'Se@,address@hidden acima',
+ 'by @emph{%{user}}' => 'por @emph{%{user}}',
+ 'by @emph{%{user}} on @emph{%{date}}' => 'por
@emph{%{user}} em @emph{%{date}}',
+ 'current' => 'atual',
+ 'on @emph{%{date}}' => 'em @emph{%{date}}',
+ 'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'see %{node_file_href}' => 'veja %{node_file_href}',
+ 'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
+ 'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
+ 'see %{reference_name}' => 'veja %{reference_name}',
+ 'see @cite{%{book}}' => 'veja @cite{%{book}}',
+ 'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
+ 'see section `%{section}\' in @cite{%{book}}' =>
'veja se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'unknown' => 'desconhecido'
};
-$T2H_OBSOLETE_STRINGS->{'no'} = {
- 'See' => 'Se',
- 'section' => 'avsnitt',
- 'see' => 'se'
+$T2H_OBSOLETE_STRINGS->{'pt_BR'} = {
+ 'See' => 'Veja',
+ 'about (help)' => 'sobre (ajuda)',
+ 'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
+ 'cover (top) of document' =>
'address@hidden'icio (topo) do documento',
+ 'current section' => 'se@,address@hidden
atual',
+ 'first section in reading order' =>
'primeira se@,address@hidden na ordem de leitura',
+ 'following node' => 'nodo seguinte',
+ 'index' => '@\'indice',
+ 'last section in reading order' =>
'@\'ultima se@,address@hidden na ordem de leitura',
+ 'next chapter' => 'address@hidden'oximo
address@hidden'itulo',
+ 'next node' => 'address@hidden'oximo
nodo',
+ 'next section in reading order' =>
'address@hidden'oxima se@,address@hidden na ordem de leitura',
+ 'next section on same level' =>
'address@hidden'oxima se@,address@hidden no mesmo address@hidden'ivel',
+ 'node following in node reading order' =>
'nodo seguinte na ordem de leitura de nodos',
+ 'node up' => 'nodo acima',
+ 'previous node' => 'nodo anterior',
+ 'previous section in reading order' =>
'se@,address@hidden anterior na ordem de leitura',
+ 'previous section on same level' =>
'se@,address@hidden anterior no mesmo address@hidden'ivel',
+ 'section' => 'Se@,address@hidden',
+ 'see' => 'veja',
+ 'short table of contents' => 'breve
address@hidden'ario',
+ 'table of contents' =>
'address@hidden'ario',
+ 'up node' => 'nodo acima',
+ 'up section' => 'se@,address@hidden acima'
};
Index: Tests/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- Tests/Makefile.in 2 Jan 2009 14:55:53 -0000 1.51
+++ Tests/Makefile.in 6 Jan 2009 00:35:27 -0000 1.52
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIR_TESTS = GermanNodeTest xemacs texinfo sectionning ccvs viper \
Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/Makefile.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- doc/Makefile.in 2 Jan 2009 14:55:53 -0000 1.46
+++ doc/Makefile.in 6 Jan 2009 00:35:27 -0000 1.47
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -153,7 +153,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Index: doc/mdate-sh
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/mdate-sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/mdate-sh 7 Jul 2005 21:44:55 -0000 1.2
+++ doc/mdate-sh 6 Jan 2009 00:35:27 -0000 1.3
@@ -1,7 +1,7 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2005-02-07.09
+scriptversion=2005-06-29.22
# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
# Foundation, Inc.
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -59,7 +59,15 @@
LC_TIME=C
export LC_TIME
-save_arg1="$1"
+# GNU ls changes its time format in response to the TIME_STYLE
+# variable. Since we cannot assume `unset' works, revert this
+# variable to its documented default.
+if test "${TIME_STYLE+set}" = set; then
+ TIME_STYLE=posix-long-iso
+ export TIME_STYLE
+fi
+
+save_arg1=$1
# Find out how to get the extended ls output of a file or directory.
if ls -L /dev/null 1>/dev/null 2>&1; then
Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/stamp-vti,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- doc/stamp-vti 2 Jan 2009 14:55:53 -0000 1.54
+++ doc/stamp-vti 6 Jan 2009 00:35:27 -0000 1.55
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 November 2008
address@hidden UPDATED 3 November 2008
@set UPDATED-MONTH November 2008
address@hidden EDITION 1.81
address@hidden VERSION 1.81
address@hidden EDITION 1.82
address@hidden VERSION 1.82
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texinfo.tex,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/texinfo.tex 7 Jul 2005 21:44:56 -0000 1.3
+++ doc/texinfo.tex 6 Jan 2009 00:35:27 -0000 1.4
@@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2005-01-30.17}
+\def\texinfoversion{2006-10-04.17}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-% Foundation, Inc.
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
+% Software Foundation, Inc.
%
% This texinfo.tex file is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -21,8 +21,8 @@
%
% You should have received a copy of the GNU General Public License
% along with this texinfo.tex file; see the file COPYING. If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
@@ -153,20 +153,22 @@
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
+% Since the category of space is not known, we have to be careful.
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode`\ =\spacecat}
+
+% sometimes characters are active, so we need control sequences.
\chardef\colonChar = `\:
\chardef\commaChar = `\,
+\chardef\dashChar = `\-
\chardef\dotChar = `\.
\chardef\exclamChar= `\!
+\chardef\lquoteChar= `\`
\chardef\questChar = `\?
+\chardef\rquoteChar= `\'
\chardef\semiChar = `\;
\chardef\underChar = `\_
-\chardef\spaceChar = `\ %
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode\spaceChar=\spacecat}
-
% Ignore a token.
%
\def\gobble#1{}
@@ -302,10 +304,14 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \escapechar = `\\ % use backslash in output files.
\indexdummies % don't expand commands in the output.
\normalturnoffactive % \ in index entries must not stay \, e.g., if
% the page break happens to be in the middle of an example.
+ % We don't want .vr (or whatever) entries like this:
+ % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+ % "\acronym" won't work when it's read back in;
+ % it needs to be
+ % {\code {{\tt \backslashcurfont }acronym}
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -333,9 +339,9 @@
\pagebody{#1}%
\ifdim\ht\footlinebox > 0pt
% Only leave this space if the footline is nonempty.
- % (We lessened \vsize for it in \oddfootingxxx.)
+ % (We lessened \vsize for it in \oddfootingyyy.)
% The \baselineskip=24pt in plain's \makefootline has no effect.
- \vskip 2\baselineskip
+ \vskip 24pt
\unvbox\footlinebox
\fi
%
@@ -356,7 +362,7 @@
\egroup % \vbox from first cropmarks clause
\fi
}% end of \shipout\vbox
- }% end of group with \normalturnoffactive
+ }% end of group with \indexdummies
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
@@ -391,7 +397,7 @@
%
\def\parsearg{\parseargusing{}}
\def\parseargusing#1#2{%
- \def\next{#2}%
+ \def\argtorun{#2}%
\begingroup
\obeylines
\spaceisspace
@@ -422,8 +428,7 @@
\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
\def\temp{#3}%
\ifx\temp\empty
- % We cannot use \next here, as it holds the macro to run;
- % thus we reuse \temp.
+ % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
\let\temp\finishparsearg
\else
\let\temp\argcheckspaces
@@ -435,14 +440,14 @@
% If a _delimited_ argument is enclosed in braces, they get stripped; so
% to get _exactly_ the rest of the line, we had to prevent such situation.
% We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \next.
+% just before passing the control to \argtorun.
% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
% either the null string, or it ends with \^^M---thus there is no danger
% that a pair of braces would be stripped.
%
% But first, we have to remove the trailing space token.
%
-\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
% \parseargdef\foo{...}
% is roughly equivalent to
@@ -566,7 +571,7 @@
\let\}=\myrbrace
\begingroup
% Definitions to produce \{ and \} commands for indices,
- % and @{ and @} for the aux file.
+ % and @{ and @} for the aux/toc files.
\catcode`\{ = \other \catcode`\} = \other
\catcode`\[ = 1 \catcode`\] = 2
\catcode`\! = 0 \catcode`\\ = \other
@@ -647,13 +652,28 @@
\let\/=\allowbreak
% @. is an end-of-sentence period.
-\def\.{.\spacefactor=3000 }
+\def\.{.\spacefactor=\endofsentencespacefactor\space}
% @! is an end-of-sentence bang.
-\def\!{!\spacefactor=3000 }
+\def\!{!\spacefactor=\endofsentencespacefactor\space}
% @? is an end-of-sentence query.
-\def\?{?\spacefactor=3000 }
+\def\?{?\spacefactor=\endofsentencespacefactor\space}
+
+% @frenchspacing on|off says whether to put extra space after punctuation.
+%
+\def\onword{on}
+\def\offword{off}
+%
+\parseargdef\frenchspacing{%
+ \def\temp{#1}%
+ \ifx\temp\onword \plainfrenchspacing
+ \else\ifx\temp\offword \plainnonfrenchspacing
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+ \fi\fi
+}
% @w prevents a word break. Without the \leavevmode, @w at the
% beginning of a paragraph, when TeX is still in vertical mode, would
@@ -1031,9 +1051,9 @@
% _ active, and distinguish by seeing if the current family is \slfam,
% which is what @var uses.
{
- \catcode\underChar = \active
+ \catcode`\_ = \active
\gdef\mathunderscore{%
- \catcode\underChar=\active
+ \catcode`\_=\active
\def_{\ifnum\fam=\slfam \_\else\sb\fi}%
}
}
@@ -1076,15 +1096,24 @@
\def\minus{$-$}
% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em. So do
+% whichever is larger.
%
\def\dots{%
\leavevmode
- \hbox to 1.5em{%
- \hskip 0pt plus 0.25fil
- .\hfil.\hfil.%
- \hskip 0pt plus 0.5fil
+ \setbox0=\hbox{...}% get width of three periods
+ \ifdim\wd0 > 1.5em
+ \dimen0 = \wd0
+ \else
+ \dimen0 = 1.5em
+ \fi
+ \hbox to \dimen0{%
+ \hskip 0pt plus.25fil
+ .\hskip 0pt plus1fil
+ .\hskip 0pt plus1fil
+ .\hskip 0pt plus.5fil
}%
}
@@ -1092,7 +1121,7 @@
%
\def\enddots{%
\dots
- \spacefactor=3000
+ \spacefactor=\endofsentencespacefactor
}
% @comma{} is so commas can be inserted into text without messing up
@@ -1176,13 +1205,63 @@
\fi
\fi
\fi
+
+% PDF uses PostScript string constants for the names of xref targets,
+% for display in the outlines, and in other places. Thus, we have to
+% double any backslashes. Otherwise, a name like "\node" will be
+% interpreted as a newline (\n), followed by o, d, e. Not good.
+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
+% (and related messages, the final outcome is that it is up to the TeX
+% user to double the backslashes and otherwise make the string valid, so
+% that's what we do).
+
+% double active backslashes.
%
address@hidden \catcode`\\=\active
+ @address@hidden
+ @address@hidden@active
+ @address@hidden
+}
+
+% To handle parens, we must adopt a different approach, since parens are
+% not active characters. hyperref.dtx (which has the same problem as
+% us) handles it with this amazing macro to replace tokens. I've
+% tinkered with it a little for texinfo, but it's definitely from there.
+%
+% #1 is the tokens to replace.
+% #2 is the replacement.
+% #3 is the control sequence with the string.
+%
+\def\HyPsdSubst#1#2#3{%
+ \def\HyPsdReplace##1#1##2\END{%
+ ##1%
+ \ifx\\##2\\%
+ \else
+ #2%
+ \HyReturnAfterFi{%
+ \HyPsdReplace##2\END
+ }%
+ \fi
+ }%
+ \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
+}
+\long\def\HyReturnAfterFi#1\fi{\fi#1}
+
+% #1 is a control sequence in which to do the replacements.
+\def\backslashparens#1{%
+ \xdef#1{#1}% redefine it as its expansion; the definition is simply
+ % \lastnode when called from \setref -> \pdfmkdest.
+ \HyPsdSubst{(}{\realbackslash(}{#1}%
+ \HyPsdSubst{)}{\realbackslash)}{#1}%
+}
+
\ifpdf
\input pdfcolor
\pdfcatalog{/PageMode /UseOutlines}%
+ % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
- \def\imagewidth{#2}%
- \def\imageheight{#3}%
+ \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+ \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
% without \immediate, pdftex seg faults when the same image is
% included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
\ifnum\pdftexversion < 14
@@ -1190,8 +1269,8 @@
\else
\immediate\pdfximage
\fi
- \ifx\empty\imagewidth\else width \imagewidth \fi
- \ifx\empty\imageheight\else height \imageheight \fi
+ \ifdim \wd0 >0pt width \imagewidth \fi
+ \ifdim \wd2 >0pt height \imageheight \fi
\ifnum\pdftexversion<13
#1.pdf%
\else
@@ -1201,13 +1280,18 @@
\pdfrefximage \pdflastximage
\fi}
\def\pdfmkdest#1{{%
- % We have to set dummies so commands such as @code in a section title
- % aren't expanded.
+ % We have to set dummies so commands such as @code, and characters
+ % such as \, aren't expanded when present in a section title.
\atdummies
- \normalturnoffactive
- \pdfdest name{#1} xyz%
- }}
- \def\pdfmkpgn#1{#1}
+ \activebackslashdouble
+ \def\pdfdestname{#1}%
+ \backslashparens\pdfdestname
+ \pdfdest name{\pdfdestname} xyz%
+ }}%
+ %
+ % used to mark target names; must be expandable.
+ \def\pdfmkpgn#1{#1}%
+ %
\let\linkcolor = \Blue % was Cyan, but that seems light?
\def\endlink{\Black\pdfendlink}
% Adding outlines to PDF; macros for calculating structure of outlines
@@ -1218,20 +1302,31 @@
\advance\tempnum by 1
\expandafter\xdef\csname#1\endcsname{\the\tempnum}}
%
- % #1 is the section text. #2 is the pdf expression for the number
- % of subentries (or empty, for subsubsections). #3 is the node
- % text, which might be empty if this toc entry had no
- % corresponding node. #4 is the page number.
+ % #1 is the section text, which is what will be displayed in the
+ % outline by the pdf viewer. #2 is the pdf expression for the number
+ % of subentries (or empty, for subsubsections). #3 is the node text,
+ % which might be empty if this toc entry had no corresponding node.
+ % #4 is the page number
%
\def\dopdfoutline#1#2#3#4{%
% Generate a link to the node text if that exists; else, use the
% page number. We could generate a destination for the section
% text in the case where a section has no node, but it doesn't
- % seem worthwhile, since most documents are normally structured.
+ % seem worth the trouble, since most documents are normally structured.
\def\pdfoutlinedest{#3}%
- \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi
+ \ifx\pdfoutlinedest\empty
+ \def\pdfoutlinedest{#4}%
+ \else
+ % Doubled backslashes in the name.
+ {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
+ \backslashparens\pdfoutlinedest}%
+ \fi
+ %
+ % Also double the backslashes in the display string.
+ {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
+ \backslashparens\pdfoutlinetext}%
%
- \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}%
+ \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
}
%
\def\pdfmakeoutlines{%
@@ -1272,7 +1367,7 @@
\def\unnsecentry{\numsecentry}%
\def\unnsubsecentry{\numsubsecentry}%
\def\unnsubsubsecentry{\numsubsubsecentry}%
- \input \jobname.toc
+ \readdatafile{toc}%
%
% Read toc second time, this time actually producing the outlines.
% The `-' means take the \expnumber as the absolute number of
@@ -1298,41 +1393,12 @@
% their "best" equivalent, based on the @documentencoding. Right
% now, I guess we'll just let the pdf reader have its way.
\indexnofonts
- \turnoffactive
+ \setupdatafile
+ \catcode`\\=\active \otherbackslash
\input \jobname.toc
\endgroup
}
%
- \def\makelinks #1,{%
- \def\params{#1}\def\E{END}%
- \ifx\params\E
- \let\nextmakelinks=\relax
- \else
- \let\nextmakelinks=\makelinks
- \ifnum\lnkcount>0,\fi
- \picknum{#1}%
- \startlink attr{/Border [0 0 0]}
- goto name{\pdfmkpgn{\the\pgn}}%
- \linkcolor #1%
- \advance\lnkcount by 1%
- \endlink
- \fi
- \nextmakelinks
- }
- \def\picknum#1{\expandafter\pn#1}
- \def\pn#1{%
- \def\p{#1}%
- \ifx\p\lbrace
- \let\nextpn=\ppn
- \else
- \let\nextpn=\ppnn
- \def\first{#1}
- \fi
- \nextpn
- }
- \def\ppn#1{\pgn=#1\gobble}
- \def\ppnn{\pgn=\first}
- \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
\ifx\PP\D\let\nextsp\relax
\else\let\nextsp\skipspaces
@@ -1347,9 +1413,17 @@
\else
\let \startlink \pdfstartlink
\fi
+ % make a live url in pdf output.
\def\pdfurl#1{%
\begingroup
- address@hidden@}%
+ % it seems we really need yet another set of dummies; have not
+ % tried to figure out what each command should do in the context
+ % of @url. for now, just make @/ a no-op, that's the only one
+ % people have actually reported a problem with.
+ %
+ \normalturnoffactive
+ address@hidden@}%
+ \let\/=\empty
\makevalueexpandable
\leavevmode\Red
\startlink attr{/Border [0 0 0]}%
@@ -1419,6 +1493,7 @@
% We don't need math for this font style.
\def\ttsl{\setfontstyle{ttsl}}
+
% Default leading.
\newdimen\textleading \textleading = 13.2pt
@@ -1440,11 +1515,13 @@
}%
}
+
% Set the font macro #1 to the font named #2, adding on the
% specified font prefix (normally `cm').
% #3 is the font's design size, #4 is a scale factor
\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
% before you read in texinfo.tex.
@@ -1468,6 +1545,10 @@
\def\scshape{csc}
\def\scbshape{csc}
+% Definitions for a main text size of 11pt. This is the default in
+% Texinfo.
+%
+\def\definetextfontsizexi{
% Text fonts (11.2pt, magstep1).
\def\textnominalsize{11pt}
\edef\mainmagstep{\magstephalf}
@@ -1581,6 +1662,165 @@
\font\reducedi=cmmi10
\font\reducedsy=cmsy10
+% reset the current fonts
+\textfonts
+\rm
+} % end of 11pt text font size definitions
+
+
+% Definitions to make the main text be 10pt Computer Modern, with
+% section, chapter, etc., sizes following suit. This is for the GNU
+% Press printing of the Emacs 22 manual. Maybe other manuals in the
+% future. Used with @smallbook, which sets the leading to 12pt.
+%
+\def\definetextfontsizex{%
+% Text fonts (10pt).
+\def\textnominalsize{10pt}
+\edef\mainmagstep{1000}
+\setfont\textrm\rmshape{10}{\mainmagstep}
+\setfont\texttt\ttshape{10}{\mainmagstep}
+\setfont\textbf\bfshape{10}{\mainmagstep}
+\setfont\textit\itshape{10}{\mainmagstep}
+\setfont\textsl\slshape{10}{\mainmagstep}
+\setfont\textsf\sfshape{10}{\mainmagstep}
+\setfont\textsc\scshape{10}{\mainmagstep}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstephalf}
+\setfont\deftt\ttshape{10}{\magstephalf}
+\setfont\defttsl\ttslshape{10}{\magstephalf}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}
+\setfont\smalltt\ttshape{9}{1000}
+\setfont\smallbf\bfshape{10}{900}
+\setfont\smallit\itshape{9}{1000}
+\setfont\smallsl\slshape{9}{1000}
+\setfont\smallsf\sfshape{9}{1000}
+\setfont\smallsc\scshape{10}{900}
+\setfont\smallttsl\ttslshape{10}{900}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}
+\setfont\smallertt\ttshape{8}{1000}
+\setfont\smallerbf\bfshape{10}{800}
+\setfont\smallerit\itshape{8}{1000}
+\setfont\smallersl\slshape{8}{1000}
+\setfont\smallersf\sfshape{8}{1000}
+\setfont\smallersc\scshape{10}{800}
+\setfont\smallerttsl\ttslshape{10}{800}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}
+\setfont\titleit\itbshape{10}{\magstep4}
+\setfont\titlesl\slbshape{10}{\magstep4}
+\setfont\titlett\ttbshape{12}{\magstep3}
+\setfont\titlettsl\ttslshape{10}{\magstep4}
+\setfont\titlesf\sfbshape{17}{\magstep1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+
+% Chapter fonts (14.4pt).
+\def\chapnominalsize{14pt}
+\setfont\chaprm\rmbshape{12}{\magstep1}
+\setfont\chapit\itbshape{10}{\magstep2}
+\setfont\chapsl\slbshape{10}{\magstep2}
+\setfont\chaptt\ttbshape{12}{\magstep1}
+\setfont\chapttsl\ttslshape{10}{\magstep2}
+\setfont\chapsf\sfbshape{12}{\magstep1}
+\let\chapbf\chaprm
+\setfont\chapsc\scbshape{10}{\magstep2}
+\font\chapi=cmmi12 scaled \magstep1
+\font\chapsy=cmsy10 scaled \magstep2
+
+% Section fonts (12pt).
+\def\secnominalsize{12pt}
+\setfont\secrm\rmbshape{12}{1000}
+\setfont\secit\itbshape{10}{\magstep1}
+\setfont\secsl\slbshape{10}{\magstep1}
+\setfont\sectt\ttbshape{12}{1000}
+\setfont\secttsl\ttslshape{10}{\magstep1}
+\setfont\secsf\sfbshape{12}{1000}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep1}
+\font\seci=cmmi12
+\font\secsy=cmsy10 scaled \magstep1
+
+% Subsection fonts (10pt).
+\def\ssecnominalsize{10pt}
+\setfont\ssecrm\rmbshape{10}{1000}
+\setfont\ssecit\itbshape{10}{1000}
+\setfont\ssecsl\slbshape{10}{1000}
+\setfont\ssectt\ttbshape{10}{1000}
+\setfont\ssecttsl\ttslshape{10}{1000}
+\setfont\ssecsf\sfbshape{10}{1000}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1000}
+\font\sseci=cmmi10
+\font\ssecsy=cmsy10
+
+% Reduced fonts for @acro in text (9pt).
+\def\reducednominalsize{9pt}
+\setfont\reducedrm\rmshape{9}{1000}
+\setfont\reducedtt\ttshape{9}{1000}
+\setfont\reducedbf\bfshape{10}{900}
+\setfont\reducedit\itshape{9}{1000}
+\setfont\reducedsl\slshape{9}{1000}
+\setfont\reducedsf\sfshape{9}{1000}
+\setfont\reducedsc\scshape{10}{900}
+\setfont\reducedttsl\ttslshape{10}{900}
+\font\reducedi=cmmi9
+\font\reducedsy=cmsy9
+
+% reduce space between paragraphs
+\divide\parskip by 2
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 10pt text font size definitions
+
+
+% We provide the user-level command
+% @fonttextsize 10
+% (or 11) to redefine the text font size. pt is assumed.
+%
+\def\xword{10}
+\def\xiword{11}
+%
+\parseargdef\fonttextsize{%
+ \def\textsizearg{#1}%
+ \wlog{doing @fonttextsize \textsizearg}%
+ %
+ % Set \globaldefs so that documents can use this inside @tex, since
+ % makeinfo 4.8 does not support it, but we need it nonetheless.
+ %
+ \begingroup \globaldefs=1
+ \ifx\textsizearg\xword \definetextfontsizex
+ \else \ifx\textsizearg\xiword \definetextfontsizexi
+ \else
+ \errhelp=\EMsimple
+ address@hidden only supports `10' or `11', not `\textsizearg'}
+ \fi\fi
+ \endgroup
+}
+
+
% In order for the font changes to affect most math symbols and letters,
% we have to define the \textfont of the standard families. Since
% texinfo doesn't allow for producing subscripts and superscripts except
@@ -1691,7 +1931,7 @@
% Set up the default fonts, so we can use them for creating boxes.
%
-\textfonts \rm
+\definetextfontsizexi
% Define these so they can be easily changed for other fonts.
\def\angleleft{$\langle$}
@@ -1749,14 +1989,21 @@
% sometimes \x has an active definition that messes things up.
%
address@hidden
- \def\frenchspacing{%
+ \def\plainfrenchspacing{%
\sfcode\dotChar address@hidden address@hidden address@hidden
address@hidden \sfcode\semiChar address@hidden \sfcode\commaChar
address@hidden
+ \def\endofsentencespacefactor{1000}% for @. and friends
+ }
+ \def\plainnonfrenchspacing{%
+ \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+ \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+ \def\endofsentencespacefactor{3000}% for @. and friends
}
address@hidden
+\def\endofsentencespacefactor{3000}% default
\def\t#1{%
- {\tt \rawbackslash \frenchspacing #1}%
+ {\tt \rawbackslash \plainfrenchspacing #1}%
\null
}
\def\samp#1{`\tclose{#1}'\null}
@@ -1793,7 +2040,7 @@
\nohyphenation
%
\rawbackslash
- \frenchspacing
+ \plainfrenchspacing
#1%
}%
\null
@@ -1809,12 +2056,21 @@
% and arrange explicitly to hyphenate at a dash.
% -- rms.
{
- \catcode`\-=\active
- \catcode`\_=\active
+ \catcode`\-=\active \catcode`\_=\active
+ \catcode`\'=\active \catcode`\`=\active
%
\global\def\code{\begingroup
- \catcode`\-=\active \let-\codedash
- \catcode`\_=\active \let_\codeunder
+ \catcode\rquoteChar=\active \catcode\lquoteChar=\active
+ \let'\codequoteright \let`\codequoteleft
+ %
+ \catcode\dashChar=\active \catcode\underChar=\active
+ \ifallowcodebreaks
+ \let-\codedash
+ \let_\codeunder
+ \else
+ \let-\realdash
+ \let_\realunder
+ \fi
\codex
}
}
@@ -1834,6 +2090,28 @@
}
\def\codex #1{\tclose{#1}\endgroup}
+% An additional complication: the above will allow breaks after, e.g.,
+% each of the four underscores in __typeof__. This is undesirable in
+% some manuals, especially if they don't have long identifiers in
+% general. @allowcodebreaks provides a way to control this.
+%
+\newif\ifallowcodebreaks \allowcodebreakstrue
+
+\def\keywordtrue{true}
+\def\keywordfalse{false}
+
+\parseargdef\allowcodebreaks{%
+ \def\txiarg{#1}%
+ \ifx\txiarg\keywordtrue
+ \allowcodebreakstrue
+ \else\ifx\txiarg\keywordfalse
+ \allowcodebreaksfalse
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+ \fi\fi
+}
+
% @kbd is like @code, except that if the argument is just one @key command,
% then @kbd has no effect.
@@ -1841,16 +2119,16 @@
% `example' (@kbd uses ttsl only inside of @example and friends),
% or `code' (@kbd uses normal tty font always).
\parseargdef\kbdinputstyle{%
- \def\arg{#1}%
- \ifx\arg\worddistinct
+ \def\txiarg{#1}%
+ \ifx\txiarg\worddistinct
\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
- \else\ifx\arg\wordexample
+ \else\ifx\txiarg\wordexample
\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
- \else\ifx\arg\wordcode
+ \else\ifx\txiarg\wordcode
\gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
\else
\errhelp = \EMsimple
- \errmessage{Unknown @kbdinputstyle option `\arg'}%
+ \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
\fi\fi\fi
}
\def\worddistinct{distinct}
@@ -1962,7 +2240,7 @@
%
\def\abbr#1{\doabbr #1,,\finish}
\def\doabbr#1,#2,#3\finish{%
- {\frenchspacing #1}%
+ {\plainfrenchspacing #1}%
\def\temp{#2}%
\ifx\temp\empty \else
\space ({\unsepspaces \ignorespaces \temp \unskip})%
@@ -2031,6 +2309,10 @@
}$%
}
+% @textdegree - the normal degrees sign.
+%
+\def\textdegree{$^\circ$}
+
% Laurent Siebenmann reports \Orb undefined with:
% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
% so we'll define it if necessary.
@@ -2202,8 +2484,8 @@
%
% Leave some space for the footline. Hopefully ok to assume
% @evenfooting will not be used by itself.
- \global\advance\pageheight by -\baselineskip
- \global\advance\vsize by -\baselineskip
+ \global\advance\pageheight by -12pt
+ \global\advance\vsize by -12pt
}
\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
@@ -2862,6 +3144,7 @@
\def\doignore#1{\begingroup
% Scan in ``verbatim'' mode:
+ \obeylines
\catcode`\@ = \other
\catcode`\{ = \other
\catcode`\} = \other
@@ -2882,16 +3165,16 @@
\gdef\dodoignore#1{%
% #1 contains the command name as a string, e.g., `ifinfo'.
%
- % Define a command to find the next address@hidden #1', which must be on a
line
- % by itself.
- address@hidden address@hidden
+ % Define a command to find the next address@hidden #1'.
+ address@hidden #1{%
+ address@hidden
+ %
% And this command to find another #1 command, at the beginning of a
% line. (Otherwise, we would consider a line address@hidden @ifset', for
% example, to count as an @ifset for nesting.)
address@hidden
%
% And now expand that command.
- \obeylines %
\doignoretext ^^M%
}%
}
@@ -2921,7 +3204,12 @@
}
% Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+ % Ignore anything after the last address@hidden #1'; this matters in verbatim
+ % environments, where otherwise the newline after an ignored conditional
+ % would result in a blank line in the output.
+ \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
% @set VAR sets the variable VAR to an empty value.
@@ -3121,42 +3409,50 @@
% we have to laboriously prevent expansion for those that we don't.
%
\def\indexdummies{%
+ \escapechar = `\\ % use backslash in output files.
address@hidden@}% change to @@ when we switch to @ as escape char in index
files.
\def\ {\realbackslash\space }%
+ %
% Need these in case \tex is in effect and \{ is a \delimiter again.
% But can't use \lbracecmd and \rbracecmd because texindex assumes
% braces and backslashes are used only as delimiters.
\let\{ = \mylbrace
\let\} = \myrbrace
%
- % \definedummyword defines \#1 as \realbackslash #1\space, thus
- % effectively preventing its expansion. This is used only for control
- % words, not control letters, because the \space would be incorrect
- % for control characters, but is needed to separate the control word
- % from whatever follows.
+ % I don't entirely understand this, but when an index entry is
+ % generated from a macro call, the \endinput which \scanmacro inserts
+ % causes processing to be prematurely terminated. This is,
+ % apparently, because \indexsorttmp is fully expanded, and \endinput
+ % is an expandable command. The redefinition below makes \endinput
+ % disappear altogether for that purpose -- although logging shows that
+ % processing continues to some further point. On the other hand, it
+ % seems \endinput does not hurt in the printed index arg, since that
+ % is still getting written without apparent harm.
+ %
+ % Sample source (mac-idx3.tex, reported by Graham Percival to
+ % help-texinfo, 22may06):
+ % @macro funindex {WORD}
+ % @findex xyz
+ % @end macro
+ % ...
+ % @funindex commtest
%
- % For control letters, we have \definedummyletter, which omits the
- % space.
+ % The above is not enough to reproduce the bug, but it gives the flavor.
%
- % These can be used both for control words that take an argument and
- % those that do not. If it is followed by {arg} in the input, then
- % that will dutifully get written to the index (or wherever).
+ % Sample whatsit resulting:
+ % address@hidden@folio address@hidden address@hidden }}}
%
- \def\definedummyword##1{%
- \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
- }%
- \def\definedummyletter##1{%
- \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
- }%
- \let\definedummyaccent\definedummyletter
+ % So:
+ \let\endinput = \empty
%
% Do the redefinitions.
\commondummies
}
-% For the aux file, @ is the escape character. So we want to redefine
-% everything using @ instead of \realbackslash. When everything uses
-% @, this will be simpler.
+% For the aux and toc files, @ is the escape character. So we want to
+% redefine everything using @ as the escape character (instead of
+% \realbackslash, still used for index files). When everything uses @,
+% this will be simpler.
%
\def\atdummies{%
address@hidden@@}%
@@ -3164,147 +3460,152 @@
\let\{ = \lbraceatcmd
\let\} = \rbraceatcmd
%
- % (See comments in \indexdummies.)
- \def\definedummyword##1{%
- \expandafter\def\csname address@hidden
- }%
- \def\definedummyletter##1{%
- \expandafter\def\csname address@hidden
- }%
- \let\definedummyaccent\definedummyletter
- %
% Do the redefinitions.
\commondummies
+ \otherbackslash
}
-% Called from \indexdummies and \atdummies. \definedummyword and
-% \definedummyletter must be defined first.
+% Called from \indexdummies and \atdummies.
%
\def\commondummies{%
%
- \normalturnoffactive
+ % \definedummyword defines \#1 as \string\#1\space, thus effectively
+ % preventing its expansion. This is used only for control% words,
+ % not control letters, because the \space would be incorrect for
+ % control characters, but is needed to separate the control word
+ % from whatever follows.
+ %
+ % For control letters, we have \definedummyletter, which omits the
+ % space.
+ %
+ % These can be used both for control words that take an argument and
+ % those that do not. If it is followed by {arg} in the input, then
+ % that will dutifully get written to the index (or wherever).
+ %
+ \def\definedummyword ##1{\def##1{\string##1\space}}%
+ \def\definedummyletter##1{\def##1{\string##1}}%
+ \let\definedummyaccent\definedummyletter
%
\commondummiesnofonts
%
- \definedummyletter{_}%
+ \definedummyletter\_%
%
% Non-English letters.
- \definedummyword{AA}%
- \definedummyword{AE}%
- \definedummyword{L}%
- \definedummyword{OE}%
- \definedummyword{O}%
- \definedummyword{aa}%
- \definedummyword{ae}%
- \definedummyword{l}%
- \definedummyword{oe}%
- \definedummyword{o}%
- \definedummyword{ss}%
- \definedummyword{exclamdown}%
- \definedummyword{questiondown}%
- \definedummyword{ordf}%
- \definedummyword{ordm}%
+ \definedummyword\AA
+ \definedummyword\AE
+ \definedummyword\L
+ \definedummyword\OE
+ \definedummyword\O
+ \definedummyword\aa
+ \definedummyword\ae
+ \definedummyword\l
+ \definedummyword\oe
+ \definedummyword\o
+ \definedummyword\ss
+ \definedummyword\exclamdown
+ \definedummyword\questiondown
+ \definedummyword\ordf
+ \definedummyword\ordm
%
% Although these internal commands shouldn't show up, sometimes they do.
- \definedummyword{bf}%
- \definedummyword{gtr}%
- \definedummyword{hat}%
- \definedummyword{less}%
- \definedummyword{sf}%
- \definedummyword{sl}%
- \definedummyword{tclose}%
- \definedummyword{tt}%
+ \definedummyword\bf
+ \definedummyword\gtr
+ \definedummyword\hat
+ \definedummyword\less
+ \definedummyword\sf
+ \definedummyword\sl
+ \definedummyword\tclose
+ \definedummyword\tt
%
- \definedummyword{LaTeX}%
- \definedummyword{TeX}%
+ \definedummyword\LaTeX
+ \definedummyword\TeX
%
% Assorted special characters.
- \definedummyword{bullet}%
- \definedummyword{comma}%
- \definedummyword{copyright}%
- \definedummyword{registeredsymbol}%
- \definedummyword{dots}%
- \definedummyword{enddots}%
- \definedummyword{equiv}%
- \definedummyword{error}%
- \definedummyword{euro}%
- \definedummyword{expansion}%
- \definedummyword{minus}%
- \definedummyword{pounds}%
- \definedummyword{point}%
- \definedummyword{print}%
- \definedummyword{result}%
+ \definedummyword\bullet
+ \definedummyword\comma
+ \definedummyword\copyright
+ \definedummyword\registeredsymbol
+ \definedummyword\dots
+ \definedummyword\enddots
+ \definedummyword\equiv
+ \definedummyword\error
+ \definedummyword\euro
+ \definedummyword\expansion
+ \definedummyword\minus
+ \definedummyword\pounds
+ \definedummyword\point
+ \definedummyword\print
+ \definedummyword\result
+ \definedummyword\textdegree
+ %
+ % We want to disable all macros so that they are not expanded by \write.
+ \macrolist
+ %
+ \normalturnoffactive
%
% Handle some cases of @value -- where it does not contain any
% (non-fully-expandable) commands.
\makevalueexpandable
- %
- % Normal spaces, not active ones.
- \unsepspaces
- %
- % No macro expansion.
- \turnoffmacros
}
% \commondummiesnofonts: common to \commondummies and \indexnofonts.
%
-% Better have this without active chars.
-{
- \catcode`\~=\other
- \gdef\commondummiesnofonts{%
+\def\commondummiesnofonts{%
% Control letters and accents.
- \definedummyletter{!}%
- \definedummyaccent{"}%
- \definedummyaccent{'}%
- \definedummyletter{*}%
- \definedummyaccent{,}%
- \definedummyletter{.}%
- \definedummyletter{/}%
- \definedummyletter{:}%
- \definedummyaccent{=}%
- \definedummyletter{?}%
- \definedummyaccent{^}%
- \definedummyaccent{`}%
- \definedummyaccent{~}%
- \definedummyword{u}%
- \definedummyword{v}%
- \definedummyword{H}%
- \definedummyword{dotaccent}%
- \definedummyword{ringaccent}%
- \definedummyword{tieaccent}%
- \definedummyword{ubaraccent}%
- \definedummyword{udotaccent}%
- \definedummyword{dotless}%
+ \definedummyletter\!%
+ \definedummyaccent\"%
+ \definedummyaccent\'%
+ \definedummyletter\*%
+ \definedummyaccent\,%
+ \definedummyletter\.%
+ \definedummyletter\/%
+ \definedummyletter\:%
+ \definedummyaccent\=%
+ \definedummyletter\?%
+ \definedummyaccent\^%
+ \definedummyaccent\`%
+ \definedummyaccent\~%
+ \definedummyword\u
+ \definedummyword\v
+ \definedummyword\H
+ \definedummyword\dotaccent
+ \definedummyword\ringaccent
+ \definedummyword\tieaccent
+ \definedummyword\ubaraccent
+ \definedummyword\udotaccent
+ \definedummyword\dotless
%
% Texinfo font commands.
- \definedummyword{b}%
- \definedummyword{i}%
- \definedummyword{r}%
- \definedummyword{sc}%
- \definedummyword{t}%
+ \definedummyword\b
+ \definedummyword\i
+ \definedummyword\r
+ \definedummyword\sc
+ \definedummyword\t
%
% Commands that take arguments.
- \definedummyword{acronym}%
- \definedummyword{cite}%
- \definedummyword{code}%
- \definedummyword{command}%
- \definedummyword{dfn}%
- \definedummyword{emph}%
- \definedummyword{env}%
- \definedummyword{file}%
- \definedummyword{kbd}%
- \definedummyword{key}%
- \definedummyword{math}%
- \definedummyword{option}%
- \definedummyword{samp}%
- \definedummyword{strong}%
- \definedummyword{tie}%
- \definedummyword{uref}%
- \definedummyword{url}%
- \definedummyword{var}%
- \definedummyword{verb}%
- \definedummyword{w}%
- }
+ \definedummyword\acronym
+ \definedummyword\cite
+ \definedummyword\code
+ \definedummyword\command
+ \definedummyword\dfn
+ \definedummyword\emph
+ \definedummyword\env
+ \definedummyword\file
+ \definedummyword\kbd
+ \definedummyword\key
+ \definedummyword\math
+ \definedummyword\option
+ \definedummyword\pxref
+ \definedummyword\ref
+ \definedummyword\samp
+ \definedummyword\strong
+ \definedummyword\tie
+ \definedummyword\uref
+ \definedummyword\url
+ \definedummyword\var
+ \definedummyword\verb
+ \definedummyword\w
+ \definedummyword\xref
}
% \indexnofonts is used when outputting the strings to sort the index
@@ -3314,13 +3615,9 @@
%
\def\indexnofonts{%
% Accent commands should become @asis.
- \def\definedummyaccent##1{%
- \expandafter\let\csname ##1\endcsname\asis
- }%
+ \def\definedummyaccent##1{\let##1\asis}%
% We can just ignore other control letters.
- \def\definedummyletter##1{%
- \expandafter\def\csname ##1\endcsname{}%
- }%
+ \def\definedummyletter##1{\let##1\empty}%
% Hopefully, all control words can become @asis.
\let\definedummyword\definedummyaccent
%
@@ -3373,9 +3670,19 @@
\def\point{.}%
\def\print{-|}%
\def\result{=>}%
+ \def\textdegree{degrees}%
%
- % Don't write macro names.
- \emptyusermacros
+ % We need to get rid of all macros, leaving only the arguments (if present).
+ % Of course this is not nearly correct, but it is the best we can do for now.
+ % makeinfo does not expand macros in the argument to @deffn, which ends up
+ % writing an index entry, and texindex isn't prepared for an index sort entry
+ % that starts with \.
+ %
+ % Since macro invocations are followed by braces, we can just redefine them
+ % to take a single TeX argument. The case of a macro invocation that
+ % goes to end-of-line is not handled.
+ %
+ \macrolist
}
\let\indexbackslash=0 %overridden during \printindex.
@@ -3422,7 +3729,6 @@
%
% Remember, we are within a group.
\indexdummies % Must do this here, since \bf, etc expand at this stage
- \escapechar=`\\
\def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
% so it will be output as is; and it will print as backslash.
%
@@ -3713,9 +4019,9 @@
\endgroup
}
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
\def\indexdotfill{\cleaders
- \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus
1fill}
+ \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
\def\primary #1{\line{#1\hfil}}
@@ -4289,14 +4595,17 @@
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unnchap}%
+ \gdef\thischapternum{}%
\gdef\thischapter{#1}%
\else\ifx\temptype\Yomitfromtockeyword
\setbox0 = \hbox{}% contents like unnumbered, but no toc entry
\def\toctype{omit}%
+ \gdef\thischapternum{}%
\gdef\thischapter{}%
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
\def\toctype{app}%
+ \xdef\thischapternum{\appendixletter}%
% We don't substitute the actual chapter name into \thischapter
% because we don't want its macros evaluated now. And we don't
% use \thissection because that changes with each section.
@@ -4306,6 +4615,7 @@
\else
\setbox0 = \hbox{#3\enspace}%
\def\toctype{numchap}%
+ \xdef\thischapternum{\the\chapno}%
\xdef\thischapter{\putwordChapter{} \the\chapno:
\noexpand\thischaptername}%
\fi\fi\fi
@@ -4417,13 +4727,21 @@
\gdef\thissection{#1}%
\fi\fi\fi
%
- % Write the toc entry (before \donoderef). See comments in \chfplain.
+ % Write the toc entry (before \donoderef). See comments in \chapmacro.
\writetocentry{\toctype\sectionlevel}{#1}{#4}%
%
% Write the node reference (= pdf destination for pdftex).
- % Again, see comments in \chfplain.
+ % Again, see comments in \chapmacro.
\donoderef{#3}%
%
+ % Interline glue will be inserted when the vbox is completed.
+ % That glue will be a valid breakpoint for the page, since it'll be
+ % preceded by a whatsit (usually from the \donoderef, or from the
+ % \writetocentry if there was no node). We don't want to allow that
+ % break, since then the whatsits could end up on page n while the
+ % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000.
+ \nobreak
+ %
% Output the actual section heading.
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
\hangindent=\wd0 % zero if no section number
@@ -4482,11 +4800,11 @@
\fi
%
\iflinks
- \toks0 = {#2}%
- \toks2 = \expandafter{\lastnode}%
- \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}%
- {\the\toks2}{\noexpand\folio}}}%
+ {\atdummies
+ \edef\temp{%
+ address@hidden
\temp
+ }%
\fi
\fi
%
@@ -4499,6 +4817,31 @@
\ifpdf \global\pdfmakepagedesttrue \fi
}
+
+% These characters do not print properly in the Computer Modern roman
+% fonts, so we must take special care. This is more or less redundant
+% with the Texinfo input format setup at the end of this file.
+%
+\def\activecatcodes{%
+ \catcode`\"=\active
+ \catcode`\$=\active
+ \catcode`\<=\active
+ \catcode`\>=\active
+ \catcode`\\=\active
+ \catcode`\^=\active
+ \catcode`\_=\active
+ \catcode`\|=\active
+ \catcode`\~=\active
+}
+
+
+% Read the toc file, which is essentially Texinfo input.
+\def\readtocfile{%
+ \setupdatafile
+ \activecatcodes
+ \input \jobname.toc
+}
+
\newskip\contentsrightmargin \contentsrightmargin=1in
\newcount\savepageno
\newcount\lastnegativepageno \lastnegativepageno = -1
@@ -4520,10 +4863,6 @@
%
\savepageno = \pageno
\begingroup % Set up to handle contents files properly.
- \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 address@hidden
- % We can't do this, because then an actual ^ in a section
- % title fails, e.g., @chapter ^ -- exponentiation. --karl, 9jul97.
- %\catcode`\^=7 % to see ^^e4 as \"a etc. address@hidden
\raggedbottom % Worry more about breakpoints than the bottom.
\advance\hsize by -\contentsrightmargin % Don't use the full line length.
%
@@ -4537,7 +4876,7 @@
\startcontents{\putwordTOC}%
\openin 1 \jobname.toc
\ifeof 1 \else
- \input \jobname.toc
+ \readtocfile
\fi
\vfill \eject
\contentsalignmacro % in case @setchapternewpage odd is in effect
@@ -4575,7 +4914,7 @@
\let\unnsubsubsecentry = \numsecentry
\openin 1 \jobname.toc
\ifeof 1 \else
- \input \jobname.toc
+ \readtocfile
\fi
\closein 1
\vfill \eject
@@ -4717,7 +5056,7 @@
{\tentt \global\dimen0 = 3em}% Width of the box.
\dimen2 = .55pt % Thickness of rules
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
%
\setbox\errorbox=\hbox to \dimen0{\hfil
\hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -4765,6 +5104,7 @@
\let\/=\ptexslash
\let\*=\ptexstar
\let\t=\ptext
+ \let\frenchspacing=\plainfrenchspacing
%
\def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
\def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
@@ -4810,7 +5150,8 @@
\let\afterenvbreak = \aboveenvbreak
-% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins.
+% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will
+% also clear it, so that its embedded environments do the narrowing again.
\let\nonarrowing=\relax
% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
@@ -4847,7 +5188,7 @@
% each corner char, and rule thickness
\normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
% Flag to tell @lisp, etc., not to narrow margin.
- \let\nonarrowing=\comment
+ \let\nonarrowing = t%
\vbox\bgroup
\baselineskip=0pt\parskip=0pt\lineskip=0pt
\carttop
@@ -4887,11 +5228,11 @@
\parskip = 0pt
\parindent = 0pt
\emergencystretch = 0pt % don't try to avoid overfull boxes
- % @cartouche defines \nonarrowing to inhibit narrowing
- % at next level down.
\ifx\nonarrowing\relax
\advance \leftskip by \lispnarrowing
\exdentamount=\lispnarrowing
+ \else
+ \let\nonarrowing = \relax
\fi
\let\exdent=\nofillexdent
}
@@ -4938,11 +5279,10 @@
%
\maketwodispenvs {lisp}{example}{%
\nonfillstart
- \tt
+ \tt\quoteexpand
\let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
\gobble % eat return
}
-
% @display/@smalldisplay: same as @lisp except keep current font.
%
\makedispenv {display}{%
@@ -4991,6 +5331,7 @@
\advance\leftskip by \lispnarrowing
\advance\rightskip by \lispnarrowing
\exdentamount = \lispnarrowing
+ \else
\let\nonarrowing = \relax
\fi
\parsearg\quotationlabel
@@ -5069,6 +5410,34 @@
\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
%
\def\starttabbox{\setbox0=\hbox\bgroup}
+
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report. xpdf does work with the
+% regular 0x27.
+%
+\def\codequoteright{%
+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+ '%
+ \else
+ \char'15
+ \fi
+}
+%
+% and a similar option for the left quote char vs. a grave accent.
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
+% the code environments to do likewise.
+%
+\def\codequoteleft{%
+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+ `%
+ \else
+ \char'22
+ \fi
+}
+%
\begingroup
\catcode`\^^I=\active
\gdef\tabexpand{%
@@ -5081,15 +5450,25 @@
\wd0=\dimen0 \box0 \starttabbox
}%
}
+ \catcode`\'=\active
+ \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
+ %
+ \catcode`\`=\active
+ \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
+ %
+ \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
\endgroup
+
+% start the verbatim environment.
\def\setupverbatim{%
+ \let\nonarrowing = t%
\nonfillstart
- \advance\leftskip by -\defbodyindent
% Easiest (and conventionally used) font for verbatim
\tt
\def\par{\leavevmode\egroup\box0\endgraf}%
\catcode`\`=\active
\tabexpand
+ \quoteexpand
% Respect line breaks,
% print special symbols as themselves, and
% make each space count
@@ -5539,7 +5918,6 @@
\spaceisspace
%
% Append \endinput to make sure that TeX does not see the ending newline.
- %
% I've verified that it is necessary both for e-TeX and for ordinary TeX
% --kasal, 29nov03
\scantokens{#1\endinput}%
@@ -5554,8 +5932,19 @@
\newcount\paramno % Count of parameters
\newtoks\macname % Macro name
\newif\ifrecursive % Is it recursive?
-\def\macrolist{} % List of all defined macros in the form
- % \do\macro1\do\macro2...
+
+% List of all defined macros in the form
+% \definedummyword\macro1\definedummyword\macro2...
+% Currently is also contains all @aliases; the list can be split
+% if there is a need.
+\def\macrolist{}
+
+% Add the macro to \macrolist
+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
+\def\addtomacrolistxxx#1{%
+ \toks0 = \expandafter{\macrolist\definedummyword#1}%
+ \xdef\macrolist{\the\toks0}%
+}
% Utility routines.
% This does \let #1 = #2, with \csnames; that is,
@@ -5653,10 +6042,7 @@
\else \errmessage{Macro name \the\macname\space already defined}\fi
\global\cslet{macsave.\the\macname}{\the\macname}%
\global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
- % Add the macroname to \macrolist
- \toks0 = \expandafter{\macrolist\do}%
- \xdef\macrolist{\the\toks0
- \expandafter\noexpand\csname\the\macname\endcsname}%
+ \addtomacrolist{\the\macname}%
\fi
\begingroup \macrobodyctxt
\ifrecursive \expandafter\parsermacbody
@@ -5670,7 +6056,7 @@
% Remove the macro name from \macrolist:
\begingroup
\expandafter\let\csname#1\endcsname \relax
- \let\do\unmacrodo
+ \let\definedummyword\unmacrodo
\xdef\macrolist{\macrolist}%
\endgroup
\else
@@ -5682,10 +6068,10 @@
% macro definitions that have been changed to \relax.
%
\def\unmacrodo#1{%
- \ifx#1\relax
+ \ifx #1\relax
% remove this
\else
- \noexpand\do \noexpand #1%
+ \noexpand\definedummyword \noexpand#1%
\fi
}
@@ -5798,30 +6184,11 @@
% {. If so it reads up to the closing }, if not, it reads the whole
% line. Whatever was read is then fed to the next control sequence
% as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
\def\braceorlinexxx{%
\ifx\nchar\bgroup\else
\expandafter\parsearg
- \fi \next}
-
-% We want to disable all macros during \shipout so that they are not
-% expanded by \write.
-\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
- \edef\next{\macrolist}\expandafter\endgroup\next}
-
-% For \indexnofonts, we need to get rid of all macros, leaving only the
-% arguments (if present). Of course this is not nearly correct, but it
-% is the best we can do for now. makeinfo does not expand macros in the
-% argument to @deffn, which ends up writing an index entry, and texindex
-% isn't prepared for an index sort entry that starts with \.
-%
-% Since macro invocations are followed by braces, we can just redefine them
-% to take a single TeX argument. The case of a macro invocation that
-% goes to end-of-line is not handled.
-%
-\def\emptyusermacros{\begingroup
- \def\do##1{\let\noexpand##1=\noexpand\asis}%
- \edef\next{\macrolist}\expandafter\endgroup\next}
+ \fi \macnamexxx}
% @alias.
@@ -5832,6 +6199,7 @@
\def\aliasyyy #1=#2\relax{%
{%
\expandafter\let\obeyedspace=\empty
+ \addtomacrolist{#1}%
\xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
}%
\next
@@ -5901,8 +6269,6 @@
\iflinks
{%
\atdummies % preserve commands, but don't expand them
- \turnoffactive
- \otherbackslash
\edef\writexrdef##1##2{%
address@hidden #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
@@ -5956,13 +6322,17 @@
\ifpdf
\leavevmode
\getfilename{#4}%
- {\turnoffactive \otherbackslash
+ {\turnoffactive
+ % See comments at \activebackslashdouble.
+ {\activebackslashdouble \xdef\pdfxrefdest{#1}%
+ \backslashparens\pdfxrefdest}%
+ %
\ifnum\filenamelength>0
\startlink attr{/Border [0 0 0]}%
- goto file{\the\filename.pdf} name{#1}%
+ goto file{\the\filename.pdf} name{\pdfxrefdest}%
\else
\startlink attr{/Border [0 0 0]}%
- goto name{\pdfmkpgn{#1}}%
+ goto name{\pdfmkpgn{\pdfxrefdest}}%
\fi
}%
\linkcolor
@@ -5976,7 +6346,6 @@
% include an _ in the xref name, etc.
\indexnofonts
\turnoffactive
- \otherbackslash
\expandafter\global\expandafter\let\expandafter\Xthisreftitle
\csname XR#1-title\endcsname
}%
@@ -5984,7 +6353,7 @@
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
\ifdim\wd0 = 0pt
- \refx{#1-snt}%
+ \refx{#1-snt}{}%
\else
\printedrefname
\fi
@@ -6011,7 +6380,7 @@
% into the usual \leavevmode...\vrule stuff for purposes of
% printing. So we \turnoffactive for the \refx-snt, back on for the
% printing, back off for the \refx-pg.
- {\turnoffactive \otherbackslash
+ {\turnoffactive
% Only output a following space if the -snt ref is nonempty; for
% @unnumbered and @anchor, it won't be.
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
@@ -6024,7 +6393,7 @@
,\space
%
% output the `page 3'.
- \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
+ \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
\fi
\fi
\endlink
@@ -6127,13 +6496,13 @@
\def\tryauxfile{%
\openin 1 \jobname.aux
\ifeof 1 \else
- \readauxfile
+ \readdatafile{aux}%
\global\havexrefstrue
\fi
\closein 1
}
-\def\readauxfile{\begingroup
+\def\setupdatafile{%
address@hidden
\catcode`\^^A=\other
\catcode`\^^B=\other
@@ -6202,11 +6571,11 @@
%
% Make the characters 128-255 be printing characters.
{%
- \count 1=128
+ \count1=128
\def\loop{%
- \catcode\count 1=\other
- \advance\count 1 by 1
- \ifnum \count 1<256 \loop \fi
+ \catcode\count1=\other
+ \advance\count1 by 1
+ \ifnum \count1<256 \loop \fi
}%
}%
%
@@ -6214,10 +6583,13 @@
\catcode`\{=1
\catcode`\}=2
address@hidden
- %
- \input \jobname.aux
-\endgroup}
+}
+\def\readdatafile#1{%
+\begingroup
+ \setupdatafile
+ \input\jobname.#1
+\endgroup}
\message{insertions,}
% including footnotes.
@@ -6411,7 +6783,7 @@
% above and below.
\nobreak\vskip\parskip
\nobreak
- \line\bgroup\hss
+ \line\bgroup
\fi
%
% Output the image.
@@ -6424,7 +6796,7 @@
\epsfbox{#1.eps}%
\fi
%
- \ifimagevmode \hss \egroup \bigbreak \fi % space after the image
+ \ifimagevmode \egroup \bigbreak \fi % space after the image
\endgroup}
@@ -6564,7 +6936,8 @@
% \floatlabel-lof. Besides \floatident, we include the short
% caption if specified, else the full caption if specified, else nothing.
{%
- \atdummies \turnoffactive \otherbackslash
+ \atdummies
+ %
% since we read the caption text in the macro world, where ^^M
% is turned into a normal character, we have to scan it back, so
% we don't write the literal three characters "^^M" into the aux file.
@@ -6585,8 +6958,9 @@
%
% place the captured inserts
%
- % BEWARE: when the floats start float, we have to issue warning whenever an
- % insert appears inside a float which could possibly float. --kasal, 26may04
+ % BEWARE: when the floats start floating, we have to issue warning
+ % whenever an insert appears inside a float which could possibly
+ % float. --kasal, 26may04
%
\checkinserts
}
@@ -6754,9 +7128,9 @@
\fi
}
-% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
-% physical page width.
+% Parameters in order: 1) textheight; 2) textwidth;
+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
+% 7) physical page height; 8) physical page width.
%
% We also call \setleading{\textleading}, so the caller should define
% \textleading. The caller should also set \parskip.
@@ -6803,7 +7177,7 @@
{11in}{8.5in}%
}}
-% Use @smallbook to reset parameters for 7x9.5 (or so) format.
+% Use @smallbook to reset parameters for 7x9.25 trim size.
\def\smallbook{{\globaldefs = 1
\parskip = 2pt plus 1pt
\textleading = 12pt
@@ -6820,6 +7194,24 @@
\defbodyindent = .5cm
}}
+% Use @smallerbook to reset parameters for 6x9 trim size.
+% (Just testing, parameters still in flux.)
+\def\smallerbook{{\globaldefs = 1
+ \parskip = 1.5pt plus 1pt
+ \textleading = 12pt
+ %
+ \internalpagesizes{7.4in}{4.8in}%
+ {-.2in}{-.4in}%
+ {0pt}{14pt}%
+ {9in}{6in}%
+ %
+ \lispnarrowing = 0.25in
+ \tolerance = 700
+ \hfuzz = 1pt
+ \contentsrightmargin = 0pt
+ \defbodyindent = .4cm
+}}
+
% Use @afourpaper to print on European A4 paper.
\def\afourpaper{{\globaldefs = 1
\parskip = 3pt plus 2pt minus 1pt
@@ -6972,6 +7364,7 @@
\catcode`\_=\active
\def_{\ifusingtt\normalunderscore\_}
+\let\realunder=_
% Subroutine for the previous macro.
\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
@@ -6994,6 +7387,13 @@
% \otherifyactive is called near the end of this file.
\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
+% Used sometimes to turn off (effectively) the active characters even after
+% parsing them.
+\def\turnoffactive{%
+ \normalturnoffactive
+ \otherbackslash
+}
+
address@hidden
% \backslashcurfont outputs one backslash character in current font,
@@ -7001,27 +7401,29 @@
\global\chardef\backslashcurfont=`\\
\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
+% \realbackslash is an actual character `\' with catcode other, and
+% \doublebackslash is two of them (for the pdf outlines).
+{\catcode`\\=\other @address@hidden @address@hidden
+
+% In texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
+\catcode`\\=\active
address@hidden@address@hidden@backslashcurfont}}
+% On startup, @fixbackslash assigns:
+% @let \ = @normalbackslash
+
% \rawbackslash defines an active \ to do \backslashcurfont.
% \otherbackslash defines an active \ to be a literal `\' character with
% catcode other.
-{\catcode`\\=\active
- @address@hidden@address@hidden
- @address@hidden@address@hidden
-}
-
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @address@hidden
-
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\backslashcurfont}}
address@hidden@address@hidden@backslashcurfont}
address@hidden@address@hidden@realbackslash}
-\catcode`\\=\active
-
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
address@hidden@turnoffactive{%
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+%
address@hidden@normalturnoffactive{%
+ @address@hidden
@let"address@hidden
- @address@hidden
@address@hidden
@address@hidden
@address@hidden
@@ -7033,12 +7435,6 @@
@unsepspaces
}
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'. (Thus, \ is not expandable when this is in
-% effect.)
-%
address@hidden@address@hidden @address@hidden
-
% Make _ and + \other characters, temporarily.
% This is canceled by @fixbackslash.
@otherifyactive
@@ -7051,9 +7447,9 @@
@address@hidden = @eatinput
% On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
+% the first `\' in the file would cause an error. This macro tries to fix
% that, assuming it is called before the first `\' could plausibly occur.
-% Also back turn on active characters that might appear in the input
+% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
%
@address@hidden
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/version.texi,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- doc/version.texi 2 Jan 2009 14:55:53 -0000 1.54
+++ doc/version.texi 6 Jan 2009 00:35:27 -0000 1.55
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 November 2008
address@hidden UPDATED 3 November 2008
@set UPDATED-MONTH November 2008
address@hidden EDITION 1.81
address@hidden VERSION 1.81
address@hidden EDITION 1.82
address@hidden VERSION 1.82
Index: test/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/Makefile.in 2 Jan 2009 14:55:54 -0000 1.7
+++ test/Makefile.in 6 Jan 2009 00:35:28 -0000 1.8
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -136,7 +136,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = run_test.sh tests.sh $(TESTS) long_tests \
@@ -262,8 +261,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -288,8 +287,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -299,12 +298,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Index: test/contents/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/contents/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/contents/Makefile.in 2 Jan 2009 14:55:54 -0000 1.4
+++ test/contents/Makefile.in 6 Jan 2009 00:35:28 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = contents_at_begin.texi contents_at_end.texi \
Index: test/coverage/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/coverage/Makefile.in 2 Jan 2009 14:55:54 -0000 1.4
+++ test/coverage/Makefile.in 6 Jan 2009 00:35:28 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = formatting.texi comments.texi pass0_macros.texi float.texi \
Index: test/encodings/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/encodings/Makefile.in 2 Jan 2009 14:55:54 -0000 1.7
+++ test/encodings/Makefile.in 6 Jan 2009 00:35:28 -0000 1.8
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = nodetest.texi nodetest_latin1.texi nodetest_utf8.texi \
Index: test/formatting/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/formatting/Makefile.in 2 Jan 2009 14:56:10 -0000 1.10
+++ test/formatting/Makefile.in 6 Jan 2009 00:35:28 -0000 1.11
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = def_cmds.texi menus.texi quotation.texi \
Index: test/htmlxref/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/htmlxref/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/htmlxref/Makefile.in 2 Jan 2009 14:56:11 -0000 1.4
+++ test/htmlxref/Makefile.in 6 Jan 2009 00:35:28 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = htmlxref.cnf \
Index: test/htmlxref-only_mono/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/htmlxref-only_mono/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/htmlxref-only_mono/Makefile.in 2 Jan 2009 14:56:11 -0000 1.4
+++ test/htmlxref-only_mono/Makefile.in 6 Jan 2009 00:35:28 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = htmlxref.cnf \
Index: test/htmlxref-only_split/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/htmlxref-only_split/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/htmlxref-only_split/Makefile.in 2 Jan 2009 14:56:14 -0000
1.4
+++ test/htmlxref-only_split/Makefile.in 6 Jan 2009 00:35:28 -0000
1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = htmlxref.cnf \
Index: test/indices/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/indices/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/indices/Makefile.in 2 Jan 2009 14:56:16 -0000 1.5
+++ test/indices/Makefile.in 6 Jan 2009 00:35:28 -0000 1.6
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = index_table.texi index_no_node.texi \
Index: test/invalid/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/invalid/Makefile.in 2 Jan 2009 14:56:18 -0000 1.5
+++ test/invalid/Makefile.in 6 Jan 2009 00:35:29 -0000 1.6
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = brace_not_closed.texi recursive_copying.texi \
Index: test/layout/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/layout/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/layout/Makefile.in 2 Jan 2009 14:56:20 -0000 1.4
+++ test/layout/Makefile.in 6 Jan 2009 00:35:29 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = no_monolithic.texi navigation.texi formatting_regions.texi \
Index: test/macros/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/macros/Makefile.in 2 Jan 2009 14:56:21 -0000 1.6
+++ test/macros/Makefile.in 6 Jan 2009 00:35:29 -0000 1.7
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = macros.texi simple_macro.texi nested_macro_calls.texi \
Index: test/manuals/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/manuals/Makefile.in 2 Jan 2009 14:56:21 -0000 1.5
+++ test/manuals/Makefile.in 6 Jan 2009 00:35:29 -0000 1.6
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = cvs.texi info-stnd.texi texinfo.texi mini_ker.texi \
Index: test/many_input_files/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/many_input_files/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/many_input_files/Makefile.in 2 Jan 2009 14:56:22 -0000 1.7
+++ test/many_input_files/Makefile.in 6 Jan 2009 00:35:29 -0000 1.8
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(TESTS) indices_res index_split_res tex_l2h_res tex_t4ht_res
Index: test/misc/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/misc/Makefile.in 2 Jan 2009 14:56:22 -0000 1.5
+++ test/misc/Makefile.in 6 Jan 2009 00:35:29 -0000 1.6
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = testkb.texi viper.texi verbatim_html.texi templates.texi \
Index: test/nested_formats/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/nested_formats/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/nested_formats/Makefile.in 2 Jan 2009 14:56:22 -0000 1.4
+++ test/nested_formats/Makefile.in 6 Jan 2009 00:35:29 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = nested_formats.texi \
Index: test/sectionning/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/sectionning/Makefile.in 2 Jan 2009 14:56:22 -0000 1.9
+++ test/sectionning/Makefile.in 6 Jan 2009 00:35:29 -0000 1.10
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = sectionning.texi novalidate.texi first_section_no_node.texi \
Index: test/singular_manual/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/singular_manual/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/singular_manual/Makefile.in 2 Jan 2009 14:56:22 -0000 1.3
+++ test/singular_manual/Makefile.in 6 Jan 2009 00:35:30 -0000 1.4
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
Index: test/tar_manual/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/tar_manual/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/tar_manual/Makefile.in 2 Jan 2009 14:56:23 -0000 1.4
+++ test/tar_manual/Makefile.in 6 Jan 2009 00:35:30 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
Index: test/texi2html_manual/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/texi2html_manual/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/texi2html_manual/Makefile.in 2 Jan 2009 14:56:23 -0000 1.4
+++ test/texi2html_manual/Makefile.in 6 Jan 2009 00:35:30 -0000 1.5
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = custhtml.texi ifo.texi options.texi texi2html.texi \
Index: test/xemacs_manual/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/xemacs_manual/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/xemacs_manual/Makefile.in 2 Jan 2009 14:56:23 -0000 1.3
+++ test/xemacs_manual/Makefile.in 6 Jan 2009 00:35:30 -0000 1.4
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in 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.
@@ -125,7 +125,6 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog INSTALL Makefile.in NEWS ac...,
Derek Robert Price <=