Merge in texinfo-3.12.

From-SVN: r18811

texinfo/ChangeLog

-Mon Feb  2 17:17:17 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+Tue Mar  3 13:29:17 1998  Karl Berry  <karl@cs.umb.edu>
 
-	* info/termdep.h (TIOCGETC): Don't define if we have termios.h.
-        From Robert Lipe.
+	* configure.in: Version 3.12.
 
-Tue Oct  7 11:14:04 1997  Michael Meissner  <meissner@cygnus.com>
+	* po/de.po: New version.
+	
+	* po/POTFILES.in: Do not include doc.c; that gets built at
+	runtime, thus causing texinfo.pot to try to get rebuilt.  Besides,
+	it doesn't have any translatable strings.
+
+Sun Mar  1 10:38:47 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c: No need for i18n on version message.  From
+ 		ke@suse.de.
+
+Fri Feb 27 16:06:23 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Run texconfig conf instead of confall.
+
+	* doc/Makefile.am (INSTALL_INFO): New variable.
+	(install-info-am): Use install-info from our distribution.
+
+	* info/info.c (info_minor_version): Increment.
+	* (info_patch_level),
+	* info/info.h (info_patch_level): Remove.
+
+	* info/info.c (program_name): Move decl.
+
+	* util/install-info.c (ensure_dirfile_exists): Use commas and \t
+	 instead of an explicit tab, which make dist expands.
+
+	* doc/texinfo.txi: @prep.ai.mit.edu -> @gnu.org.
+
+	* info/info.c: Make help messages consistent with others.
+
+	* util/install-info.c (print_help): Format consistently.
+	
+	(readfile): Support gzipped files via libz.
+	From: Elliot Lee <sopwith@redhat.com>
+	Date: Mon, 1 Sep 1997 23:37:14 -0400 (EDT)
+
+Thu Feb 26 16:13:14 1998  Karl Berry  <karl@cs.umb.edu>
 
-	* info/tilde.c (alloca): Don't redefine alloca as __builtin_alloca
-	if alloca was already defined.
+	* info/echo-area.c: Whoops, _ might not start with parens.
 
-Mon Oct  6 12:46:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* configure.in: Check for libz.
+	Do not output emacs/Makefile.
 
-	* util/Makefile.am (bin_PROGRAMS): Remove install-info.
-	(noinst_PROGRAMS, install_inf_SOURCES): Define.
-	(install-exec-local): New target.
-	* util/Makefile.in: Rebuild.
-	* info/Makefile.in: Rebuild with current automake.
+	* Makefile.am (AUTOMAKE_OPTIONS): Set to 1.2f.
 
-Wed Sep  3 12:44:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* util/texi2dvi: Always remove temporary directories. (From Akim.)
+	Formatting changes.
 
-	* po/Makefile.in.in: More --enable-maintainer-mode changes.
+Wed Feb 25 15:26:26 1998  Karl Berry  <karl@cs.umb.edu>
 
-Thu Aug 28 23:52:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* util/texi2dvi: New options --batch, --clean.
+	From: Akim Demaille <demaille@inf.enst.fr>
+	Date: 15 Aug 1997 18:05:33 +0200
+	* doc/texinfo.txi (Format with texi2dvi): Mention --help.
 
-	* po/Makefile.in.in: Make automatic dependencies only run programs
-	if --enable-maintainer-mode.
+	Applied this:
+1997-08-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
-Mon Aug 25 16:50:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* makeinfo/makeinfo.c (me_executing_string): New variable.
+	(me_execute_string): Use it instead of executing_string.
+	(popfile): Check for me_executing_string as well as
+	executing_string.
+	(get_until_in_line): Likewise.
+	(insert_and_underscore): Do not write any expansion output if
+	executing a string.
+	(cm_node, cm_include, index_add_arg, cm_footnote, execute_macro,
+	cm_macro, cm_unmacro): Likewise.
+	(cm_footnote): Include the footnote marker in the expansion
+	output.
+	(append_to_expansion_output): Do nothing if the input_text wasn't
+	a remembered text.
+	(defun_internal): Make the index entry even if expanding macros.
+	(expansion): Don't reset macro_expansion_output_stream around call
+	to execute_string.
+	(apply): Fix typo.
 
-	* configure.in: Add AM_MAINTAINER_MODE and AM_EXEEXT.
-	* Makefile.in, */Makefile.in: Rebuild with automake --cygnus.
-	* configure: Rebuild with current autoconf.
+Tue Feb 24 17:33:44 1998  Karl Berry  <karl@cs.umb.edu>
+
+	1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/makeinfo.c (get_until_in_line): Don't use xstrdup on
+		the unterminated input_text.
+
+	* makeinfo/makeinfo.c: Don't assume all \'s in macro bodies are
+		arguments.
+	From: Mathias.Herberts@irisa.fr (Mathias Herberts)
+	Date: Tue, 6 Jan 1998 18:54:26 +0100
+
+	* configure.in: Check for sigblock in libc before libbsd.
+	* From: hjl@lucon.org (H.J. Lu)
+	* Date: Fri, 23 Jan 1998 21:50:25 -0800 (PST)
+
+Mon Feb 23 16:26:31 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/window.c (character_width): If ISO_Latin_p is set, make
+		printable_limit 255, not 160.  ISO Latin 1 uses
+		essentially all of the 256 characters.
+	Reported by: Marius Groeger <mag@sysgo.de>
+	Date: Wed, 17 Dec 1997 16:05:27 +0100
+
+	* info/info.c: Improve help message.
+
+Sun Feb 22 17:38:32 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* Makefile.am (SUBDIRS): Remove emacs; we'll just distribute the
+		Elisp files with Emacs.
+
+	* doc/Makefile.am (info_TEXINFOS, texinfo): Rename manual to
+		texinfo.txi to avoid DOS filename clash with texinfo.tex.
+
+	* info/tilde.c: Copy slightly updated alloca stuff from makeinfo.
+
+	* util/texindex.c (main): Declare as returning int to placate
+ 		warnings.
+
+	* info/Makefile.am: Uncomment BUILT_SOURCES stuff and add missing _.
+	From: "Joel N. Weber II" <devnull@gnu.org>
+	Date: Fri, 30 Jan 1998 17:21:38 -1000
+
+	* util/texindex.c,
+	* util/install-info.c,
+	* makeinfo/makeinfo.c,
+	* info/info.c: Change help address to @gnu.org.
+
+	1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/makeinfo.c (usage): Fix order of arguments to help
+		format string.
+
+	* makeinfo/makeinfo.c (cm_top): Error message wording.
+
+	* doc/texinfo.texi (Functions in Typed Languages): Remove
+		duplicate description of @deftypemethod.
+	From: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise)
+	Date: Wed, 07 Jan 1998 11:11:50 +0100
+
+	* info/session.c (info_get_input_char) [EINTR]: Keep reading if we
+		get EINTR.
+	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	Date: 22 Dec 1997 10:32:53 +0100
+
+Sat Feb 21 17:41:26 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (find_and_load): Malloc enough room for the
+		null as well as the newline.
+	From: "John W. Eaton" <jwe@bevo.che.wisc.edu>
+	Date: Tue, 30 Sep 1997 21:12:01 -0500
+
+	* util/texindex.c (--version),
+	* makeinfo/makeinfo.c (cm_today),
+	* makeinfo/makeinfo.c (print_version_info): Version strings etc. do not
+		need translation. 
+	From: Karl Eichwalder <ke@suse.de>
+	Date: 13 Sep 1997 16:20:02 +0200
+
+	* info/echo-area.c: Rewrite pluralization to be translatable.
+	From: Karl Eichwalder <ke@suse.de>
+	Date: 13 Sep 1997 16:20:02 +0200
+
+	* util/texindex.c,
+	* info/info.c,
+	* makeinfo/makeinfo.c,
+	* util/install-info.c: --version: Give year as argument to printf,
+		to reduce the number of translations needed.
+	From: Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>
+	Date: 02 Sep 1997 18:01:26 +0200
+
+	* util/texindex.c: Remove the fnctl.h and sys/file.h conditional #includes, they are
+	already in lib/system.h.
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST)
+
+	* info/terminal.c (terminal_begin_using_terminal,
+ 	  terminal_end_using_terminal): #ifdef SIGWINCH settings for
+	 	  m68k-motorola-sysv.
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST)
+
+	* info/filesys.c (info_suffixes): Add /index as a possibility for
+		subdirectories.
+	From: Matthew Wilcox <willy@odie.barnet.ac.uk>
+	Date: Wed, 6 Aug 1997 15:55:16 +0100 (BST)
+
+	* configure.in: Redirect texconfig input from /dev/null to avoid
+		stoppage.
+	From: Thomas Esser <te@informatik.uni-hannover.de>
+	Date: Mon, 4 Aug 1997 18:15:49 +0200
+
+	* makeinfo/makeinfo.c (find_and_load): Null-terminate the input text.
+	From: Kenneth Stailey <kstailey@disclosure.com>.
+
+	* info/Makefile.am (INCLUDES): Add -I.. -I$(srcdir).
+
+Fri Aug 22 16:24:59 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Adjust ISBN, edition number for print run.
+
+Mon Aug  4 16:12:42 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info.c (main) [INFODIR]: Add this to infopath, if set.
+	* info/Makefile.am (DEFS): New define, include -DINFODIR.
+	From: Larry Schwimmer <rosebud@cyclone.Stanford.EDU>.
+
+	* util/install-info.c (ensure_dirfile_exists): Use tabs instead of
+ 		spaces on the File: dir line.
+ 	Bug from: Dave Love <d.love@dl.ac.uk>.
+
+Sat Aug  2 12:43:57 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_value, cm_email, cm_uref): Have to cast
+ 		from unsigned char * to char * or IRIX cc complains.
+	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
 
-Wed Feb 12 11:15:16 1997  Michael Meissner  <meissner@cygnus.com>
+Fri Aug  1 14:05:10 1997  Karl Berry  <karl@cs.umb.edu>
 
-	* util/texindex.c (main): Make main an int function, not void.
+	* Makefile.am (EXTRA_DIST): Remove README-alpha.
+	From: "ir. Mark M._Kettenis" <kettenis@phys.uva.nl>.
 
-Sat Jun 29 18:56:07 1996  Geoffrey Noer  <noer@cygnus.com>
+1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>	
 
-	* configure.in: if ac_cv_c_cross is yes, don't run the
-	AC_FUNC_SETVBUF_REVERSED call since it tries to do a run
-	test.  This allows texinfo to build for cygwin32 Canadian
-	crosses/natives
-	* configure: regenerate
+	* configure.in: Use AC_CHECK_HEADERS, not AC_CHECK_HEADER.
 
 Thu Jul 31 11:57:46 1997  Karl Berry  <karl@cs.umb.edu>
 

texinfo/INTRODUCTION

 Getting Started with Texinfo
 ============================
 
-25 March 1993
-
-Most of the installation instructions are described in the file `INSTALL'.
-One additional note to make is that if your info files are in a nonstandard
-place (i.e. not in the `info' directory immediately under $prefix) you may
-wish to change the default info path as specified via DEFAULT_INFOPATH in
-info/Makefile.in.
-
 "Texinfo" is a documentation system that uses a single source file to
 produce both on-line information and printed output.  Using Texinfo,
 you can create a printed document with the normal features of a book,
@@ -16,23 +8,23 @@ including chapters, sections, cross references, and indices.  From the
 same Texinfo source file, you can create a menu-driven, on-line Info
 file with nodes, menus, cross references, and indices.
   
-The name of the Texinfo source documentation file is `texinfo.texi'.
+The name of the Texinfo source documentation file is `texinfo.txi'.
 You can produce both on-line information and printed output from this
 source file.  The documentation describes Texinfo in detail, including
 how to write Texinfo files, how to format them for both hard copy and
 Info, and how to install Info files.
 
 To get started, you need to create either a printed manual or an
-on-line Info file from the `texinfo.texi' file.  You do not need to
+on-line Info file from the `texinfo.txi' file.  You do not need to
 create both, although you will probably want both eventually.
 
 To learn how to use Info, read the info documentation.  You can do this in
 one of two ways: using the standalone `info' program, or using Info mode in
 GNU Emacs.
 
-  * If you want to use the `info' program, type
+  * If you want to use the `info' program, run
 
-         $ info -f info-stnd
+         info -f info-stnd
 
   * If you want to use Emacs, start up emacs and type `C-h i' [M-x info].
     Follow the instructions to learn how to use Info.
@@ -40,7 +32,7 @@ GNU Emacs.
 After learning how to use Info, you can read the Texinfo documentation.
 Using the standalone `info', type the following at the shell prompt:
 
-         $ info -f texinfo
+         info -f texinfo
 
 To use read this manual in Emacs, you first need to edit the Info-directory
 menu (the file `dir' in the system info directory) to contain the
@@ -114,6 +106,6 @@ The name of the printing command depends on the system; `lpr -d' is
 common, and is illustrated here.  You may use a different name for the
 printing command.
 
-Please report bugs to bug-texinfo@prep.ai.mit.edu.
+Please report bugs to bug-texinfo@gnu.org.
 
 Happy formatting.

texinfo/Makefile.am

 ## Makefile.am for texinfo.
-## $Id: Makefile.am,v 1.3 1998/03/24 18:04:57 law Exp $
+## $Id: Makefile.am,v 1.5 1998/04/10 00:37:57 law Exp $
 ## Process this file with automake to produce Makefile.in in all directories.
 
-## Be sure we're using the right version of Automake.
-AUTOMAKE_OPTIONS = 1.1p
+# Be sure we're using the right version of Automake.
+# 1.2f was the first version that supported .txi as a Texinfo suffix.
+AUTOMAKE_OPTIONS = 1.2f
 
 # Additional files to distribute.
-EXTRA_DIST = INTRODUCTION dir-example README-alpha
+EXTRA_DIST = INTRODUCTION dir-example
 
 # All subdirectories.
 # Do intl/ and lib/ first since the C programs depend on them.
 # Do doc/ last so makeinfo will be built when we get there.
 # Others are alphabetical.
-SUBDIRS = intl lib emacs info makeinfo po util doc
+SUBDIRS = intl lib info makeinfo po util doc

texinfo/NEWS

 This file records noteworthy changes.
 
+3.12 (3 March 1998)
+* Elisp files removed, since they are only usefully distributed with Emacs.
+* Restore inclusion of compile-time $(infodir) to INFOPATH.
+* install-info creates a proper dir file.
+* Various portability fixes.
+
 3.11 (31 July 1997)
 * New commands:
   - @uref to make a reference to a url; @url now only indicates such.

texinfo/README

 This is the README file for the GNU Texinfo distribution.
+The primary distribution point is ftp://ftp.gnu.org/pub/gnu.
 
-Please email bugs or suggestions to bug-texinfo@prep.ai.mit.edu.
+Please email bugs or suggestions to bug-texinfo@gnu.org.  (If you wish,
+you can join this list by sending a subscribe message to
+bug-texinfo-request@gnu.org.)  Patches are welcome; if possible, please
+make them with diff -c and include ChangeLog entries.
 
-Files within this distribution have their own version and edition
-numbers.  When you refer to a file, please mention its own version, as
-well as the version number of the Texinfo distribution.
+Programs within this distribution have their own version numbers.  When
+you refer to a file, please mention its own version, as well as the
+version number of the Texinfo distribution.
 
-For instructions on compiling and installing info, makeinfo, texi2dvi,
-and texindex, please read the file `INSTALL'.  Also:
-
-    * The Emacs Lisp files are not compiled or installed by default; to
-      install them, use `make install' in the `emacs' subdirectory.  See
-      ./emacs/README for some considerations.
+For generic installation instructions on compiling and installing this
+Automake-based distribution, please read the file `INSTALL'.
+Installation notes specific to Texinfo:
 
     * The Info tree uses a file `dir' as its root node; the `dir-example'
       file in this distribution is included for informative purposes.
-      Use it or not as you like.
+      Use it, modify it, or ignore it just as you like.
 
     * You can create a file texinfo.cnf to be read by TeX when
       processing Texinfo manuals.  For example, it might contain the
       command @afourpaper.  See the `Preparing for TeX' node in
       texinfo.texi for more details.
 
-
-Texinfo is a documentation system that uses a single source file to
-produce both online information and printed output.  This means that
-instead of writing two different documents, one for the online help or
-other online information and the other for a typeset manual or other
-printed work, you need write only one document.  When the work is
-revised, you need revise only one document.  You can read the online
-information, known as an "Info file", with an Info documentation-reading
-program.  By convention, Texinfo source file names end with a `.texi' or
-`.texinfo' extension.  Texinfo is described in the Texinfo manual (the
-file ./doc/texinfo.texi).
-
-You can write and format Texinfo files into Info files within GNU Emacs,
-and read them using the Emacs Info reader.  If you do not have Emacs,
-you can format Texinfo files into Info files using `makeinfo' and read
-them using `info'.  Use TeX, which is not included in this package (see
-`How to Obtain TeX' in the Texinfo manual for information), to typeset
-Texinfo files for printing.
+    * If your info files are not in $prefix/info, you may wish to add a line
+#define DEFAULT_INFOPATH "/mydir1:/mydir2:/etc"
+      to config.h after running configure.
 
 
 This distribution includes (but is not limited to) the following files:
 
     README                      This file.
-    INTRODUCTION                This file tells you how to create
-                                readable files from the Texinfo source
-                                files in this distribution.
+    INTRODUCTION                Brief introduction to the system, and
+                                how to create readable files from the
+                                Texinfo source files in this distribution.
 
 Texinfo source files (in ./doc):
 
-    texinfo.texi                This manual describes Texinfo.  It
+    texinfo.texi                This manual describes the Texinfo language
+                                and many of the associated tools.  It
                                 tells how to use Texinfo to write
                                 documentation, how to use Texinfo mode
-                                in GNU Emacs, how to use TeX,
-                                makeinfo, and the Emacs Lisp Texinfo
-                                formatting commands.
+                                in GNU Emacs, TeX, makeinfo, and the
+                                Emacs Lisp Texinfo formatting commands.
 
     info.texi                   This manual tells you how to use 
                                 Info.  This document comes as part of
@@ -74,7 +60,7 @@ Texinfo source files (in ./doc):
 
 Printing related files:
 
-    texinfo.tex                 This TeX definitions file tells
+    doc/texinfo.tex             This TeX definitions file tells
                                 the TeX program how to typeset a
                                 Texinfo file into a DVI file ready for
                                 printing.
@@ -90,25 +76,6 @@ Printing related files:
                                 source document uses Texinfo @macros.
 
 
-GNU Emacs related files (in ./emacs):
-
-    texinfmt.el                 This Emacs Lisp file provides the
-                                functions that GNU Emacs uses to
-                                format a Texinfo file into an Info
-                                file.
-
-    texinfo.el                  This file provides Texinfo mode
-                                for GNU Emacs.
-
-    texnfo-upd.el               These files provides commands to
-    makeinfo.el                 help you write Texinfo files
-                                using GNU Emacs Texinfo mode.
-
-    info.el                     These are the standard GNU Emacs
-    informat.el                 Info reading and support files,
-                                included here for your convenience.
- 
-
 Source files for standalone C programs (./lib, ./makeinfo, ./info):
 
     makeinfo.c                  This file contains the source for
@@ -143,7 +110,7 @@ Installation files:
                                 to use to make a Makefile.in.
                                
 
-Other files:
+Other files (util):
 
     NEWS                        This contains a summary of new
                                 features since the first edition 

texinfo/TODO

-If you are interested in working on any of these,
-email bug-texinfo@prep.ai.mit.edu.
+If you are interested in working on any of these, email bug-texinfo@gnu.org.
 
 * Makeinfo:
-  - HTML output.
+  - HTML output is being actively worked on, and with luck will be in
+    the next release.
   - A detexinfo program, like detex or delatex.  This command would
     strip all the texinfo commands out, and would be used as a filter on
     the way to a speller.  An option would be to NOT strip comments out.
@@ -12,8 +12,9 @@ email bug-texinfo@prep.ai.mit.edu.
     enumerate chapters and sections, convert cross-refs and indices to
     chapter/section references.  See:
        ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2/faq201s.zip
+  - Call Ghostscript to get ASCII output for the @image command.
 
-n* TeX:
+* TeX:
   - Use @ as the escape character, and Texinfo syntax generally, in the
     table of contents, aux, and index files.  Eliminate all the crazy
     multiple redefinitions of every Texinfo command in different contexts.

texinfo/config.h.in

@@ -185,6 +185,9 @@
 /* Define if you have the <malloc.h> header file.  */
 #undef HAVE_MALLOC_H
 
+/* Define if you have the <ncurses/termcap.h> header file.  */
+#undef HAVE_NCURSES_TERMCAP_H
+
 /* Define if you have the <nl_types.h> header file.  */
 #undef HAVE_NL_TYPES_H
 
@@ -203,6 +206,9 @@
 /* Define if you have the <sys/file.h> header file.  */
 #undef HAVE_SYS_FILE_H
 
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
+
 /* Define if you have the <sys/ptem.h> header file.  */
 #undef HAVE_SYS_PTEM_H
 
@@ -236,6 +242,9 @@
 /* Define if you have the i library (-li).  */
 #undef HAVE_LIBI
 
+/* Define if you have the z library (-lz).  */
+#undef HAVE_LIBZ
+
 /* For gettext (NLS) */
 #include <libintl.h>
 #define _(String) gettext (String)

texinfo/config.sub

 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -149,19 +149,20 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid \
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 \
 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -170,14 +171,18 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -204,9 +209,9 @@ case $basic_machine in
 	amiga | amiga-*)
 		basic_machine=m68k-cbm
 		;;
-	amigados)
+	amigaos | amigados)
 		basic_machine=m68k-cbm
-		os=-amigados
+		os=-amigaos
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-cbm
@@ -345,19 +350,19 @@ case $basic_machine in
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3456]86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3456]86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3456]86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -391,11 +396,11 @@ case $basic_machine in
 		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
-		os=-linux
+		os=-linux-gnu
 		;;
 	mips*-linux*)
 		basic_machine=mips-unknown
-		os=-linux
+		os=-linux-gnu
 		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -464,25 +469,23 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-*)
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -566,6 +569,12 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -585,7 +594,7 @@ case $basic_machine in
 		basic_machine=vax-dec
 		os=-vms
 		;;
-       vpp*|vx|vx-*)
+	vpp*|vx|vx-*)
                basic_machine=f301-fujitsu
                ;;
 	vxworks960)
@@ -615,7 +624,7 @@ case $basic_machine in
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 	mips)
-		if [ x$os = x-linux ]; then
+		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
 		else
 			basic_machine=mips-mips
@@ -680,9 +689,12 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-unixware* | svr4*)
+	-svr4*)
 		os=-sysv4
 		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
@@ -693,7 +705,8 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
@@ -701,7 +714,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -linux-gnu* | -uxpv*)
+	      | -mingw32* | -linux-gnu* | -uxpv*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
@@ -827,7 +840,7 @@ case $basic_machine in
 		os=-sysv
 		;;
 	*-cbm)
-		os=-amigados
+		os=-amigaos
 		;;
 	*-dg)
 		os=-dgux

texinfo/configure.in

 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.5 1998/03/24 18:05:13 law Exp $
+dnl $Id: configure.in,v 1.7 1998/03/26 10:30:41 law Exp $
 dnl
 AC_INIT(makeinfo/makeinfo.c)
 AC_PREREQ(2.12)dnl Minimum Autoconf version required.
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE([texinfo], [3.11])
+AM_INIT_AUTOMAKE([texinfo], [3.12])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -16,7 +16,7 @@ AC_PROG_RANLIB
 # We do this for the sake of a more helpful warning in doc/Makefile.
 TEXMF='$(datadir)/texmf'
 AC_CHECK_PROG(TEXCONFIG, texconfig, true, false)
-$TEXCONFIG && eval `texconfig confall | grep '^TEXMF='`
+$TEXCONFIG && eval `texconfig conf </dev/null | grep '^TEXMF='`
 AC_SUBST(TEXMF)
 
 AC_ISC_POSIX
@@ -27,8 +27,10 @@ AM_MAINTAINER_MODE
 AM_EXEEXT
 
 dnl Checks for libraries.
-# Needed on sysV68 for sigblock, sigsetmask.
-AC_CHECK_LIB(bsd, sigblock)
+AC_CHECK_LIB(z, gzdopen)
+
+# Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
+AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock))
 
 # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
 # rather ncurses.  So we check for it.
@@ -40,16 +42,16 @@ done
 AC_SUBST(TERMLIBS)
 
 dnl Checks for header files.
+dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
+if test "x$termlib" = xncurses; then
+  dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
+  AC_CHECK_HEADERS(ncurses/termcap.h)
+fi
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h pwd.h string.h strings.h termcap.h termio.h \
   termios.h unistd.h \
   sys/fcntl.h sys/file.h sys/ptem.h sys/time.h sys/ttold.h sys/wait.h)
 
-dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
-if test "x$termlib" = xncurses; then
-  AC_CHECK_HEADER(ncurses/termcap.h)
-fi
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T
 AC_TYPE_SIGNAL
@@ -59,9 +61,7 @@ AC_STRUCT_TM
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_VPRINTF
-if test "$ac_cv_c_cross" = no; then
-  AC_FUNC_SETVBUF_REVERSED
-fi
+AC_FUNC_SETVBUF_REVERSED
 AC_CHECK_FUNCS(setvbuf getcwd memset bzero strchr strcasecmp \
   sigprocmask sigsetmask)
 dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
@@ -74,7 +74,6 @@ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 
 AC_OUTPUT([Makefile             \
            doc/Makefile         \
-           emacs/Makefile       \
            info/Makefile        \
            intl/Makefile        \
            lib/Makefile         \

texinfo/doc/Makefile.am

 ## Makefile.am for texinfo/emacs.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:05:32 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:20:38 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
-info_TEXINFOS = info-stnd.texi info.texi texinfo.texi
+info_TEXINFOS = info-stnd.texi info.texi texinfo.txi
 
-# Use the makeinfo built in our distribution.
+# Use the programs built in our distribution.
 MAKEINFO = ../makeinfo/makeinfo
+INSTALL_INFO = ../util/install-info
 
 # Include our texinfo.tex, not Automake's.
 EXTRA_DIST = macro.texi userdoc.texi epsf.tex texinfo.tex
@@ -26,10 +27,10 @@ dist-info:
 # since we don't distribute them.
 .texi.info:
 	$(MAKEINFO) -I$(srcdir) `echo $< | sed 's,.*/,,'`
-texinfo: $(srcdir)/texinfo.texi
-	$(MAKEINFO) -I$(srcdir) texinfo.texi
+texinfo: $(srcdir)/texinfo.txi
+	$(MAKEINFO) -I$(srcdir) texinfo.txi
 
-# Do not try to install them from $(srcdir).
+# Similarly, Do not try to install the info files from $(srcdir).
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
@@ -43,14 +44,14 @@ install-info-am: $(INFO_DEPS)
 	  done; \
 	done
 	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	@if $(SHELL) -c '$(INSTALL_INFO) --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  for file in $(INFO_DEPS); do \
-	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
-	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
+	    echo " $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file";\
+	    $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file || :;\
 	  done; \
 	else : ; fi
 
 
-# Remove them at make distclean.
+# Remove the info files at make distclean.
 distclean-aminfo:
 	rm -f texinfo texinfo-* info*.info*

texinfo/doc/README

 This directory contains documentation on the Texinfo system and the TeX
-sources needed to process Texinfo sources.
+sources needed to process Texinfo sources.  (Use texi2dvi to run a
+Texinfo manual through TeX to produce a DVI file.)
 
 The .tex files are not installed automatically because TeX installations
 vary so widely.  Installing them in the wrong place would give a false

texinfo/doc/info-stnd.texi

@@ -9,7 +9,7 @@
 @synindex fn cp
 @synindex ky cp
 @comment %**end of header
-@comment $Id: info-stnd.texi,v 1.2 1998/03/24 18:05:36 law Exp $
+@comment $Id: info-stnd.texi,v 1.1.1.2 1998/03/24 18:20:36 law Exp $
 
 @dircategory Texinfo documentation system
 @direntry

texinfo/doc/info.texi

@@ -3,7 +3,7 @@
 @setfilename info.info
 @settitle Info 1.0
 @comment %**end of header 
-@comment $Id: info.texi,v 1.2 1998/03/24 18:05:37 law Exp $
+@comment $Id: info.texi,v 1.1.1.2 1998/03/24 18:20:37 law Exp $
 
 @dircategory Texinfo documentation system
 @direntry

texinfo/info/Makefile.am

 ## Makefile.am for texinfo/info.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:05:58 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:20:06 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_PROGRAMS = makedoc
@@ -13,7 +13,10 @@ transform = s/ginfo/info/; @program_transform_name@
 localedir = $(datadir)/locale
 
 # -I. for funs.h.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
+# we need to override it, so include them ourselves.
+INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
+DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@
 
 makedoc_SOURCES = makedoc.c
@@ -32,13 +35,11 @@ EXTRA_DIST = README
 # files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
 # listing the functions found.  `doc.c' is a structure containing pointers
 # to those functions along with completable names and documentation strings.
-# 
-# I do not know how to get this right.
-# BUILT_SOURCES = doc.c funs.h
-#
-#cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
-#  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
-#  $(srcdir)/footnotes.c $(srcdir)/variables.c
-#
-#$(BUILTSOURCES): makedoc $(cmd_sources)
-#	./makedoc $(cmd_sources)
+BUILT_SOURCES = doc.c funs.h
+
+cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
+  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
+  $(srcdir)/footnotes.c $(srcdir)/variables.c
+
+$(BUILT_SOURCES): makedoc $(cmd_sources)
+	./makedoc $(cmd_sources)

texinfo/info/README

@@ -6,8 +6,7 @@ maintain, and thus decided to write this one.
 
 The rewrite consists of about 12,000 lines of code written in about 12
 days.  I believe this version of Info to be in much better shape than the
-original Info, and the only reason it is in Beta test is because of its
-short life span.
+original Info.
 
 Info 2.0 is substantially different from its original standalone
 predecessor.  It appears almost identical to the GNU Emacs version, but has
@@ -24,8 +23,4 @@ A full listing of the commands available in Info can be gotten by typing
 `?' while within an Info window.  This produces a node in a window which
 can be viewed just like any Info node.
 
-Please send your comments, bug reports, and suggestions to
-
-	bug-texinfo@prep.ai.mit.edu
-
---Brian Fox <bfox@ai.mit.edu>
+--Brian Fox <bfox@gnu.org>

texinfo/info/echo-area.c

 /* echo-area.c -- How to read a line in the echo area.
-   $Id: echo-area.c,v 1.2 1998/03/24 18:06:11 law Exp $
+   $Id: echo-area.c,v 1.1.1.2 1998/03/24 18:20:08 law Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -938,11 +938,9 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions"))
       int limit, count, max_label = 0;
 
       initialize_message_buffer ();
-      printf_to_message_buffer
-        (_("There %s %d "), completions_found_index == 1 ? _("is") : _("are"),
-         completions_found_index);
-      printf_to_message_buffer
-        (_("completion%s:\n"), completions_found_index == 1 ? "" : "s");
+      printf_to_message_buffer (completions_found_index == 1
+                                ? _("One completion:\n")
+                                : _("%d completions:\n"));
 
       /* Find the maximum length of a label. */
       for (i = 0; i < completions_found_index; i++)

texinfo/info/echo-area.h

 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.2 1998/03/24 18:06:12 law Exp $
+   $Id: echo-area.h,v 1.1.1.2 1998/03/24 18:20:09 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.

texinfo/info/filesys.c

 /* filesys.c -- File system specific functions for hacking this system.
-   $Id: filesys.c,v 1.2 1998/03/24 18:06:16 law Exp $
+   $Id: filesys.c,v 1.1.1.3 1998/03/24 18:20:10 law Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@ static char *info_suffixes[] = {
   "",
   ".info",
   "-info",
+  "/index",
   (char *)NULL
 };
 

texinfo/info/funs.h

@@ -29,7 +29,6 @@ extern void info_prev_node ();
 extern void info_up_node ();
 extern void info_last_node ();
 extern void info_first_node ();
-extern void info_history_node ();
 extern void info_last_menu_item ();
 extern void info_menu_digit ();
 extern void info_menu_item ();
@@ -40,6 +39,7 @@ extern void info_goto_node ();
 extern void info_man ();
 extern void info_top_node ();
 extern void info_dir_node ();
+extern void info_history_node ();
 extern void info_kill_node ();
 extern void info_view_file ();
 extern void info_print_node ();

texinfo/info/info.c

 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.2 1998/03/24 18:06:30 law Exp $
+   $Id: info.c,v 1.1.1.3 1998/03/24 18:20:13 law Exp $
 
-   Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 96, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,8 +29,10 @@
 
 /* The version numbers of this version of Info. */
 int info_major_version = 2;
-int info_minor_version = 17;
-int info_patch_level = 0;
+int info_minor_version = 18;
+
+/* basename (argv[0]) */
+static char *program_name = NULL;
 
 /* Non-zero means search all indices for APROPOS_SEARCH_STRING. */
 static int apropos_p = 0;
@@ -100,7 +102,7 @@ static char *short_options = "d:n:f:o:s";
 int info_windows_initialized_p = 0;
 
 /* Some "forward" declarations. */
-static void usage (), info_short_help (), remember_info_program_name ();
+static void info_short_help (), remember_info_program_name ();
 
 
 /* **************************************************************** */
@@ -207,7 +209,8 @@ main (argc, argv)
           break;
 
         default:
-          usage ();
+          fprintf (stderr, _("Try --help for more information."));
+          exit (1);
         }
     }
 
@@ -223,11 +226,13 @@ main (argc, argv)
   /* If the user specified --version, then show the version and exit. */
   if (print_version_p)
     {
-      printf ("info (GNU %s %s) %s\n", PACKAGE, VERSION, version_string ());
-      puts ("Copyright (C) 1997 Free Software Foundation, Inc.\n\
+      printf ("%s (GNU %s %s) %s\n", program_name, PACKAGE, VERSION, 
+              version_string ());
+      printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.");
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
       exit (0);
     }
 
@@ -238,7 +243,10 @@ For more information about these matters, see the files named COPYING.");
       exit (0);
     }
   
-  /* If the user hasn't specified a path for Info files, default it.  */
+  /* If the user hasn't specified a path for Info files, default it.
+     Lowest priority is our messy hardwired list in filesys.h.
+     Then comes the user's INFODIR from the Makefile.
+     Highest priority is the environment variable, if set.  */
   if (!infopath)
     {
       char *path_from_env = getenv ("INFOPATH");
@@ -252,10 +260,18 @@ For more information about these matters, see the files named COPYING.");
               path_from_env[len - 1] = 0;
               info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
             }
+#ifdef INFODIR /* from the Makefile */
+          info_add_path (INFODIR, INFOPATH_PREPEND);
+#endif
           info_add_path (path_from_env, INFOPATH_PREPEND);
         }
       else
-        info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
+        {
+          info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
+#ifdef INFODIR /* from the Makefile */
+         info_add_path (INFODIR, INFOPATH_PREPEND);
+#endif
+        }
     }
 
   /* If the user specified a particular filename, add the path of that
@@ -517,19 +533,12 @@ version_string ()
     {
       vstring = (char *)xmalloc (50);
       sprintf (vstring, "%d.%d", info_major_version, info_minor_version);
-      if (info_patch_level)
-        sprintf (vstring + strlen (vstring), "-p%d", info_patch_level);
     }
   return (vstring);
 }
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Error Handling for Info                          */
-/*                                                                  */
-/* **************************************************************** */
 
-static char *program_name = (char *)NULL;
+
+/* Error handling.  */
 
 static void
 remember_info_program_name (fullpath)
@@ -586,44 +595,33 @@ info_error (format, arg1, arg2)
     }
 }
 
-/* Produce a very brief descripton of the available options and exit with
-   an error. */
-static void
-usage ()
-{
-  fprintf (stderr,"%s\n%s\n%s\n%s\n%s\n",
-_("Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."),
-_("            [--directory dir-path] [--file info-file] [--node node-name]..."),
-_("            [--help] [--output output-file] [--subnodes] [--version]"),
-_("            [--dribble dribble-file] [--restore from-file]"),
-_("            [menu-selection ...]"));
-  exit (1);
-}
-
 /* Produce a scaled down description of the available options to Info. */
 static void
 info_short_help ()
 {
-  puts (_("\
-Here is a quick description of Info's options.  For a more complete\n\
-description of how to use Info, type `info info options'.\n\
+  printf (_("\
+Usage: %s [OPTION]... [INFO-FILE [MENU-ITEM...]]\n\
+\n\
+Read documentation in Info format.\n\
+For more complete documentation on how to use Info, run `info info options'.\n\
 \n\
-   --directory DIR              Add DIR to INFOPATH.\n\
-   --dribble FILENAME           Remember user keystrokes in FILENAME.\n\
-   --file FILENAME              Specify Info file to visit.\n\
-   --node NODENAME              Specify nodes in first visited Info file.\n\
-   --output FILENAME            Output selected nodes to FILENAME.\n\
-   --restore FILENAME           Read initial keystrokes from FILENAME.\n\
-   --subnodes                   Recursively output menu items.\n\
-   --help                       Get this help message.\n\
-   --version                    Display Info's version information.\n\
+Options:\n\
+--directory DIR              add DIR to INFOPATH.\n\
+--dribble FILENAME           remember user keystrokes in FILENAME.\n\
+--file FILENAME              specify Info file to visit.\n\
+--node NODENAME              specify nodes in first visited Info file.\n\
+--output FILENAME            output selected nodes to FILENAME.\n\
+--restore FILENAME           read initial keystrokes from FILENAME.\n\
+--subnodes                   recursively output menu items.\n\
+--help                       display this help and exit.\n\
+--version                    display version information and exit.\n\
 \n\
-Remaining arguments to Info are treated as the names of menu\n\
-items in the initial node visited.  You can easily move to the\n\
-node of your choice by specifying the menu names which describe\n\
-the path to that node.  For example, `info emacs buffers'.\n\
+The first argument, if present, is the name of the Info file to read.\n\
+Any remaining arguments are treated as the names of menu\n\
+items in the initial node visited.  For example, `info emacs buffers'\n\
+moves to the node `buffers' in the info file `emacs'.\n\
 \n\
-Email bug reports to bug-texinfo@prep.ai.mit.edu."));
+Email bug reports to bug-texinfo@gnu.org."), program_name);
 
   exit (0);
 }

texinfo/info/info.h

 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.2 1998/03/24 18:06:31 law Exp $
+   $Id: info.h,v 1.1.1.3 1998/03/24 18:20:14 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ extern int info_error_rings_bell_p;
 extern void info_error ();
 
 /* The version numbers of Info. */
-extern int info_major_version, info_minor_version, info_patch_level;
+extern int info_major_version, info_minor_version;
 
 /* How to get the version string for this version of Info.  Returns
    something similar to "2.11". */

texinfo/info/session.c

 /* session.c -- The user windowing interface to Info.
-   $Id: session.c,v 1.2 1998/03/24 18:06:46 law Exp $
+   $Id: session.c,v 1.1.1.3 1998/03/24 18:20:15 law Exp $
 
    Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
 
@@ -4206,7 +4206,20 @@ info_get_input_char ()
          out how many characters are currently buffered, we
          should stay with away from stream I/O.
          --Egil Kvaleberg <egilk@sn.no>, January 1997.  */
+#ifdef EINTR
+      /* Keep reading if we got EINTR, so that we don't just exit.
+         --Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>,
+         22 Dec 1997.  */
+      {
+        int n;
+        do
+	  n = read (tty, &c, 1);
+        while (n == -1 && errno == EINTR);
+        rawkey = n == 1 ? c : EOF;
+      }
+#else
       rawkey = (read (tty, &c, 1) == 1) ? c : EOF;
+#endif
 
       keystroke = rawkey;
 

texinfo/info/termdep.h

 /* termdep.h -- System things that terminal.c depends on.
-   $Id: termdep.h,v 1.4 1998/03/24 18:06:50 law Exp $
+   $Id: termdep.h,v 1.5 1998/03/24 19:40:54 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
@@ -33,11 +33,6 @@
 
 #ifdef HAVE_TERMIOS_H
 #  include <termios.h>
- /*
-    POSIX does not mandate that we have these and it may, in fact, be only
-    partially implemented.
-  */
-#  undef TIOCGETC
 #else
 #  if defined (HAVE_TERMIO_H)
 #    include <termio.h>

texinfo/info/terminal.c

 /* terminal.c -- How to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.4 1998/03/24 18:06:53 law Exp $
+   $Id: terminal.c,v 1.1.1.3 1998/03/24 18:20:18 law Exp $
 
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -141,7 +141,10 @@ terminal_begin_using_terminal ()
   if (!term_begin_use || !*term_begin_use)
     return;
 
+#ifdef SIGWINCH
   sigsave = signal (SIGWINCH, SIG_IGN); 
+#endif
+
   send_to_terminal (term_begin_use);
   /* Without this fflush and sleep, running info in a shelltool or
      cmdtool (TERM=sun-cmd) with scrollbars loses -- the scrollbars are
@@ -149,7 +152,10 @@ terminal_begin_using_terminal ()
      From: strube@physik3.gwdg.de (Hans Werner Strube).  */
   fflush (stdout);
   sleep (1);
+
+#ifdef SIGWINCH
   signal (SIGWINCH, sigsave);
+#endif
 }
 
 /* Tell the terminal that we will not be doing any more cursor
@@ -165,11 +171,17 @@ terminal_end_using_terminal ()
   if (!term_end_use || !*term_end_use)
     return;
 
+#ifdef SIGWINCH
   sigsave = signal (SIGWINCH, SIG_IGN);
+#endif
+
   send_to_terminal (term_end_use);
   fflush (stdout);
   sleep (1);
+
+#ifdef SIGWINCH
   signal (SIGWINCH, sigsave);
+#endif
 }
 
 /* **************************************************************** */

texinfo/info/tilde.c

 /* tilde.c -- Tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.2 1998/03/24 18:06:55 law Exp $
+   $Id: tilde.c,v 1.1.1.3 1998/03/24 18:20:19 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96 Free Software Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,22 +23,26 @@
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
+/* Indent #pragma so that older Cpp's don't try to parse it. */
+#ifdef _AIX
+ #pragma alloca
+#endif /* _AIX */
+
 /* Include config.h before doing alloca.  */
 #include "info.h"
 
-#ifndef alloca
-#if defined (__GNUC__)
-#  define alloca __builtin_alloca
-#else /* !__GNUC__ */
-#  if defined (_AIX)
- #pragma alloca
-#  else /* !_AIX */
-#    if defined (HAVE_ALLOCA_H)
-#      include <alloca.h>
-#    endif /* HAVE_ALLOCA_H */
-#  endif /* !AIX */
-#endif /* !__GNUC__ */
-#endif /* ! defined alloca */
+#ifdef __GNUC__
+# undef alloca
+# define alloca __builtin_alloca
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifndef _AIX
+char *alloca ();
+#  endif
+# endif
+#endif
 
 #if defined (TEST) || defined (STATIC_MALLOC)
 static void *xmalloc (), *xrealloc ();

texinfo/info/window.c

 /* window.c -- Windows in Info.
-   $Id: window.c,v 1.2 1998/03/24 18:06:59 law Exp $
+   $Id: window.c,v 1.1.1.3 1998/03/24 18:20:20 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
@@ -723,7 +723,7 @@ character_width (character, hpos)
   int width = 1;
 
   if (ISO_Latin_p)
-    printable_limit = 160;
+    printable_limit = 255;
 
   if (character > printable_limit)
     width = 3;

texinfo/intl/ChangeLog

-Thu Sep  4 15:01:11 1997  Jeffrey A Law  (law@cygnus.com)
+1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
 
-	* Makefile.in (install-info): Add dummy target.
+	* intlh.inst.in: Reformat copyright.
+
+1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (DCGETTEXT): Remove wrong comment.
+
+1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install-data): Don't change directory to install.
+
+1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
+
+	* cat-compat.c: Fix copyright.
+
+	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
+
+	* loadmsgcat.c: Update copyright.  Fix typos.
+
+	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
+	(_nl_make_l10nflist): Handle sponsor and revision correctly.
+
+	* gettext.c: Update copyright.
+	* gettext.h: Likewise.
+	* hash-string.h: Likewise.
+
+	* finddomain.c: Remoave dead code.  Define strchr only if
+	!HAVE_STRCHR.
+
+	* explodename.c: Include <sys/types.h>.
+
+	* explodename.c: Reformat copyright text.
+	(_nl_explode_name): Fix typo.
+
+	* dcgettext.c: Define and use __set_errno.
+	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
+	not defined.
+
+	* bindtextdom.c: Pretty printing.
+
+1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (guess_category_value): Don't depend on
+	HAVE_LC_MESSAGES.  We don't need the macro here.
+	Patch by Bruno Haible <haible@ilog.fr>.
+
+	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
+	macro.  Instead use HAVE_LOCALE_NULL and define it when using
+	glibc, as in dcgettext.c.
+	Patch by Bruno Haible <haible@ilog.fr>.
+
+	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
+	Pinard.
 
 Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
 

texinfo/intl/Makefile.in

@@ -50,6 +50,7 @@ RANLIB = @RANLIB@
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
 -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
+CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
@@ -130,10 +131,9 @@ install-data: all
 	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
-	  cd $(srcdir) && \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $$file $(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
@@ -148,7 +148,7 @@ uninstall:
 	  rm -f $(gettextsrcdir)/$$file; \
 	done
 
-info dvi install-info:
+info dvi:
 
 $(OBJECTS): ../config.h libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h

texinfo/intl/VERSION

-GNU gettext library from gettext-0.10.27
+GNU gettext library from gettext-0.10.32

texinfo/intl/bindtextdom.c

-/* bindtextdom.c -- implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Implementation of the bindtextdomain(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ void free ();
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
 # endif
 #endif
 
@@ -61,6 +61,7 @@ extern struct binding *_nl_domain_bindings;
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
+# define strdup(str) __strdup (str)
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
 #endif
@@ -98,25 +99,36 @@ BINDTEXTDOMAIN (domainname, dirname)
 
   if (binding != NULL)
     {
-      /* The domain is already bound.  Replace the old binding.  */
-      char *new_dirname;
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_dirname = (char *) _nl_default_dirname;
-      else
+      /* The domain is already bound.  If the new value and the old
+	 one are equal we simply do nothing.  Otherwise replace the
+	 old binding.  */
+      if (strcmp (dirname, binding->dirname) != 0)
 	{
-	  size_t len = strlen (dirname) + 1;
-	  new_dirname = (char *) malloc (len);
-	  if (new_dirname == NULL)
-	    return NULL;
+	  char *new_dirname;
+
+	  if (strcmp (dirname, _nl_default_dirname) == 0)
+	    new_dirname = (char *) _nl_default_dirname;
+	  else
+	    {
+#if defined _LIBC || defined HAVE_STRDUP
+	      new_dirname = strdup (dirname);
+	      if (new_dirname == NULL)
+		return NULL;
+#else
+	      size_t len = strlen (dirname) + 1;
+	      new_dirname = (char *) malloc (len);
+	      if (new_dirname == NULL)
+		return NULL;
 
-	  memcpy (new_dirname, dirname, len);
-	}
+	      memcpy (new_dirname, dirname, len);
+#endif
+	    }
 
-      if (strcmp (binding->dirname, _nl_default_dirname) != 0)
-        free (binding->dirname);
+	  if (binding->dirname != _nl_default_dirname)
+	    free (binding->dirname);
 
-      binding->dirname = new_dirname;
+	  binding->dirname = new_dirname;
+	}
     }
   else
     {
@@ -128,21 +140,33 @@ BINDTEXTDOMAIN (domainname, dirname)
       if (new_binding == NULL)
 	return NULL;
 
+#if defined _LIBC || defined HAVE_STRDUP
+      new_binding->domainname = strdup (domainname);
+      if (new_binding->domainname == NULL)
+	return NULL;
+#else
       len = strlen (domainname) + 1;
       new_binding->domainname = (char *) malloc (len);
       if (new_binding->domainname == NULL)
-	  return NULL;
+	return NULL;
       memcpy (new_binding->domainname, domainname, len);
+#endif
 
       if (strcmp (dirname, _nl_default_dirname) == 0)
 	new_binding->dirname = (char *) _nl_default_dirname;
       else
 	{
+#if defined _LIBC || defined HAVE_STRDUP
+	  new_binding->dirname = strdup (dirname);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+#else
 	  len = strlen (dirname) + 1;
 	  new_binding->dirname = (char *) malloc (len);
 	  if (new_binding->dirname == NULL)
 	    return NULL;
 	  memcpy (new_binding->dirname, dirname, len);
+#endif
 	}
 
       /* Now enqueue it.  */

texinfo/intl/cat-compat.c

 /* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -40,6 +39,16 @@ char *getenv ();
 
 /* @@ end of prolog @@ */
 
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  And even worse: POSIX
+   defines this not at all.  So we can use this feature only on selected
+   system (e.g. those using GNU C Library).  */
+#ifdef _LIBC
+# define HAVE_LOCALE_NULL
+#endif
+
 /* The catalog descriptor.  */
 static nl_catd catalog = (nl_catd) -1;
 
@@ -68,7 +77,8 @@ textdomain (domainname)
   size_t new_name_len;
   char *lang;
 
-#if HAVE_SETLOCALE && HAVE_LC_MESSAGES && HAVE_SETLOCALE_NULL
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
+    && defined HAVE_LOCALE_NULL
   lang = setlocale (LC_MESSAGES, NULL);
 #else
   lang = getenv ("LC_ALL");

texinfo/intl/dcgettext.c

-/* dcgettext.c -- implementation of the dcgettext(3) function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Implementation of the dcgettext(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -42,6 +42,9 @@ char *alloca ();
 #ifndef errno
 extern int errno;
 #endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
 
 #if defined STDC_HEADERS || defined _LIBC
 # include <stdlib.h>
@@ -273,13 +276,13 @@ DCGETTEXT (domainname, msgid, category)
       dirname = (char *) alloca (path_max + dirname_len);
       ADD_BLOCK (block_list, dirname);
 
-      errno = 0;
+      __set_errno (0);
       while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
 	{
 	  path_max += PATH_INCR;
 	  dirname = (char *) alloca (path_max + dirname_len);
 	  ADD_BLOCK (block_list, dirname);
-	  errno = 0;
+	  __set_errno (0);
 	}
 
       if (ret == NULL)
@@ -287,14 +290,10 @@ DCGETTEXT (domainname, msgid, category)
 	  /* We cannot get the current working directory.  Don't signal an
 	     error but simply return the default string.  */
 	  FREE_BLOCKS (block_list);
-	  errno = saved_errno;
+	  __set_errno (saved_errno);
 	  return (char *) msgid;
 	}
 
-      /* We don't want libintl.a to depend on any other library.  So
-	 we avoid the non-standard function stpcpy.  In GNU C Library
-	 this function is available, though.  Also allow the symbol
-	 HAVE_STPCPY to be defined.  */
       stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
     }
 
@@ -305,10 +304,7 @@ DCGETTEXT (domainname, msgid, category)
   xdomainname = (char *) alloca (strlen (categoryname)
 				 + strlen (domainname) + 5);
   ADD_BLOCK (block_list, xdomainname);
-  /* We don't want libintl.a to depend on any other library.  So we
-     avoid the non-standard function stpcpy.  In GNU C Library this
-     function is available, though.  Also allow the symbol HAVE_STPCPY
-     to be defined.  */
+
   stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
 		  domainname),
 	  ".mo");
@@ -329,7 +325,7 @@ DCGETTEXT (domainname, msgid, category)
 	{
 	  /* The whole contents of CATEGORYVALUE has been searched but
 	     no valid entry has been found.  We solve this situation
-	     by implicitely appending a "C" entry, i.e. no translation
+	     by implicitly appending a "C" entry, i.e. no translation
 	     will take place.  */
 	  single_locale[0] = 'C';
 	  single_locale[1] = '\0';
@@ -348,7 +344,7 @@ DCGETTEXT (domainname, msgid, category)
 	  || strcmp (single_locale, "POSIX") == 0)
 	{
 	  FREE_BLOCKS (block_list);
-	  errno = saved_errno;
+	  __set_errno (saved_errno);
 	  return (char *) msgid;
 	}
 
@@ -377,7 +373,7 @@ DCGETTEXT (domainname, msgid, category)
 	  if (retval != NULL)
 	    {
 	      FREE_BLOCKS (block_list);
-	      errno = saved_errno;
+	      __set_errno (saved_errno);
 	      return retval;
 	    }
 	}
@@ -538,7 +534,8 @@ category_to_name (category)
 }
 
 /* Guess value of current locale from value of the environment variables.  */
-static const char *guess_category_value (category, categoryname)
+static const char *
+guess_category_value (category, categoryname)
      int category;
      const char *categoryname;
 {

texinfo/intl/explodename.c

-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -23,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include "loadinfo.h"
 
@@ -164,7 +163,7 @@ _nl_explode_name (name, language, modifier, territory, codeset,
 	}
     }
 
-  /* For CEN sytnax values it might be important to have the
+  /* For CEN syntax values it might be important to have the
      separator character in the file name, not for XPG syntax.  */
   if (syntax == xpg)
     {

texinfo/intl/finddomain.c

-/* finddomain.c -- handle list of needed message catalogs
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -39,12 +39,14 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
-# endif
 #endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
@@ -60,18 +62,6 @@ void free ();
 #endif
 
 /* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define stpcpy(dest, src) __stpcpy(dest, src)
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
 /* List of already loaded domains.  */
 static struct loaded_l10nfile *_nl_loaded_domains;
 
@@ -103,7 +93,7 @@ _nl_find_domain (dirname, locale, domainname)
 
      and six parts for the CEN syntax:
 
-	language[_territory][+audience][+special][,sponsor][_revision]
+	language[_territory][+audience][+special][,[sponsor][_revision]]
 
      Beside the first all of them are allowed to be missing.  If the
      full specified locale is not found, the less specific one are
@@ -168,7 +158,7 @@ _nl_find_domain (dirname, locale, domainname)
 			   &sponsor, &revision);
 
   /* Create all possible locale entries which might be interested in
-     generalzation.  */
+     generalization.  */
   retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
 			       strlen (dirname) + 1, mask, language, territory,
 			       codeset, normalized_codeset, modifier, special,
@@ -197,21 +187,3 @@ _nl_find_domain (dirname, locale, domainname)
 
   return retval;
 }
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif

texinfo/intl/gettext.c

-/* gettext.c -- implementation of gettext(3) function
-   Copyright (C) 1995 Software Foundation, Inc.
+/* Implementation of gettext(3) function
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

texinfo/intl/gettext.h

-/* gettext.h - internal header for GNU gettext internationalization functions
-   Copyright (C) 1995 Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+/* Internal header for GNU gettext internationalization functions
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1

texinfo/intl/hash-string.h

-/* hash-string - Implements a string hashing function.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/* Implements a string hashing function.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_VALUES_H
 # include <values.h>

texinfo/intl/l10nflist.c

-/* finddomain.c -- handle list of needed message catalogs
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 # include <config.h>
 #endif
 
+
 #if defined HAVE_STRING_H || defined _LIBC
 # ifndef _GNU_SOURCE
 #  define _GNU_SOURCE	1
@@ -27,18 +28,21 @@
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
-# endif
 #endif
 
 #if defined _LIBC || defined HAVE_ARGZ_H
 # include <argz.h>
 #endif
 #include <ctype.h>
+#include <sys/types.h>
 
 #if defined STDC_HEADERS || defined _LIBC
 # include <stdlib.h>
@@ -198,14 +202,16 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 				  + ((mask & XPG_NORM_CODESET) != 0
 				     ? strlen (normalized_codeset) + 1 : 0)
 				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0) ?
-				     strlen (modifier) + 1 : 0)
+				      || (mask & CEN_AUDIENCE) != 0)
+				     ? strlen (modifier) + 1 : 0)
 				  + ((mask & CEN_SPECIAL) != 0
 				     ? strlen (special) + 1 : 0)
-				  + ((mask & CEN_SPONSOR) != 0
-				     ? strlen (sponsor) + 1 : 0)
-				  + ((mask & CEN_REVISION) != 0
-				     ? strlen (revision) + 1 : 0)
+				  + (((mask & CEN_SPONSOR) != 0
+				      || (mask & CEN_REVISION) != 0)
+				     ? (1 + ((mask & CEN_SPONSOR) != 0
+					     ? strlen (sponsor) + 1 : 0)
+					+ ((mask & CEN_REVISION) != 0
+					   ? strlen (revision) + 1 : 0)) : 0)
 				  + 1 + strlen (filename) + 1);
 
   if (abs_filename == NULL)
@@ -248,15 +254,16 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
       *cp++ = '+';
       cp = stpcpy (cp, special);
     }
-  if ((mask & CEN_SPONSOR) != 0)
+  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
     {
       *cp++ = ',';
-      cp = stpcpy (cp, sponsor);
-    }
-  if ((mask & CEN_REVISION) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, revision);
+      if ((mask & CEN_SPONSOR) != 0)
+	cp = stpcpy (cp, sponsor);
+      if ((mask & CEN_REVISION) != 0)
+	{
+	  *cp++ = '_';
+	  cp = stpcpy (cp, revision);
+	}
     }
 
   *cp++ = '/';
@@ -313,8 +320,8 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
     }
 
   entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry correcponds not to
-     a real file.  So we have to use the DIRLIST separation machanism
+  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
+     a real file.  So we have to use the DIRLIST separation mechanism
      of the inner loop.  */
   cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
   for (; cnt >= 0; --cnt)

texinfo/intl/libgettext.h

-/* libgettext.h -- Message catalogs for internationalization.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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.  */
 
 /* Because on some systems (e.g. Solaris) we sometimes have to include
    the systems libintl.h as well as this file we have more complex
@@ -151,13 +151,13 @@ extern int _nl_msg_cat_cntr;
 	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
 	   {								      \
 	     __translation__ =						      \
-	       dcgettext__ ((Domainname), (Msgid), (Category));		      \
+	       dcgettext__ (Domainname, Msgid, Category);		      \
 	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
 	   }								      \
 	 __result = __translation__;					      \
        }								      \
      else								      \
-       __result = dcgettext__ ((Domainname), (Msgid), (Category));	      \
+       __result = dcgettext__ (Domainname, Msgid, Category);		      \
      __result;								      \
     }))
 #  endif

texinfo/intl/loadmsgcat.c

-/* loadmsgcat.c -- load needed message catalogs
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Load needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -41,8 +41,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
+/* Rename the non ISO C functions.  This is required by the standard
+   because some ISO C functions will require linking with this object
    file and the name space must not be polluted.  */
 # define fstat  __fstat
 # define open   __open
@@ -55,7 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* We need a sign, whether a new catalog was loaded, which can be associated
    with all translations.  This is important if the translations are
    cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
+int _nl_msg_cat_cntr = 0;
 
 
 /* Load the message catalogs specified by FILENAME.  If it is no valid

texinfo/intl/localealias.c

-/* localealias.c -- handle aliases for locale names
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Handle aliases for locale names
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -59,12 +59,14 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
-# endif
 #endif
 
 #include "gettext.h"
@@ -295,7 +297,7 @@ read_alias_file (fname, fname_len)
 	    }
 	}
 
-      /* Possibily not the whole line fitted into the buffer.  Ignore
+      /* Possibly not the whole line fits into the buffer.  Ignore
 	 the rest of the line.  */
       while (strchr (cp, '\n') == NULL)
 	{

texinfo/intl/textdomain.c

-/* textdomain.c -- implementation of the textdomain(3) function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Implementation of the textdomain(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
 # endif
 #endif
 
@@ -54,6 +54,7 @@ extern const char *_nl_current_default_domain;
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define TEXTDOMAIN __textdomain
+# define strdup(str) __strdup (str)
 #else
 # define TEXTDOMAIN textdomain__
 #endif
@@ -82,11 +83,15 @@ TEXTDOMAIN (domainname)
       /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
+#if defined _LIBC || defined HAVE_STRDUP
+      _nl_current_default_domain = strdup (domainname);
+#else
       size_t len = strlen (domainname) + 1;
       char *cp = (char *) malloc (len);
       if (cp != NULL)
 	memcpy (cp, domainname, len);
       _nl_current_default_domain = cp;
+#endif
     }
 
   if (old != _nl_default_default_domain)

texinfo/lib/Makefile.am

 ## Makefile.am for texinfo/lib.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:07:26 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:19:49 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_LIBRARIES = libtxi.a

texinfo/lib/Makefile.in

-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -43,27 +49,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -117,9 +122,9 @@ OBJECTS = $(libtxi_a_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus lib/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -129,7 +134,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-noinstLIBRARIES:
 
 clean-noinstLIBRARIES:
-	test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
 distclean-noinstLIBRARIES:
 
@@ -138,38 +143,49 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
 libtxi.a: $(libtxi_a_OBJECTS) $(libtxi_a_DEPENDENCIES)
-	rm -f libtxi.a
+	-rm -f libtxi.a
 	$(AR) cru libtxi.a $(libtxi_a_OBJECTS) $(libtxi_a_LIBADD)
 	$(RANLIB) libtxi.a
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -179,17 +195,21 @@ subdir = lib
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+getopt.o: getopt.c ../config.h
+getopt1.o: getopt1.c ../config.h getopt.h
+xmalloc.o: xmalloc.c
+xstrdup.o: xstrdup.c ../config.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
 install-exec: 
 	@$(NORMAL_INSTALL)
 
@@ -209,19 +229,19 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-tags mostlyclean-generic
 
@@ -230,7 +250,7 @@ clean:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
 
 distclean:  distclean-noinstLIBRARIES distclean-compile distclean-tags \
 		distclean-generic clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
@@ -243,8 +263,8 @@ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-info install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

texinfo/lib/README

-Common routines to the Texinfo package.
+Common routines for the Texinfo package.
+
 Many are common to other GNU packages as well.
-(On the FSF machines, check /gd/gnu/lib for the latest.)
+(On the FSF machines, check /home/gd/gnu/lib for the latest.)

texinfo/lib/getopt.c

@@ -6,23 +6,23 @@
    Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
    	Free Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -79,12 +79,6 @@ USA.  */
 #endif
 #endif
 
-#if defined (WIN32) && !defined (__CYGWIN32__)
-/* It's not Unix, really.  See?  Capital letters.  */
-#include <windows.h>
-#define getpid() GetCurrentProcessId()
-#endif
-
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
@@ -262,8 +256,6 @@ static int nonoption_flags_len;
 static int original_argc;
 static char *const *original_argv;
 
-extern pid_t __libc_pid;
-
 /* Make sure the environment variable bash 2.0 puts in the environment
    is valid for the getopt call we must make sure that the ARGV passed
    to getopt is that one passed to the process.  */
@@ -276,7 +268,9 @@ store_args_and_env (int argc, char *const *argv)
   original_argc = argc;
   original_argv = argv;
 }
+# ifdef text_set_element
 text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
 
 # define SWAP_FLAGS(ch1, ch2) \
   if (nonoption_flags_len > 0)						      \
@@ -329,9 +323,9 @@ exchange (argv)
 	nonoption_flags_len = nonoption_flags_max_len = 0;
       else
 	{
-	  memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len);
-	  memset (&new_str[nonoption_flags_max_len], '\0',
-		  top + 1 - nonoption_flags_max_len);
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
 	  nonoption_flags_max_len = top + 1;
 	  __getopt_nonoption_flags = new_str;
 	}
@@ -440,11 +434,8 @@ _getopt_initialize (argc, argv, optstring)
 	      if (__getopt_nonoption_flags == NULL)
 		nonoption_flags_max_len = -1;
 	      else
-		{
-		  memcpy (__getopt_nonoption_flags, orig_str, len);
-		  memset (&__getopt_nonoption_flags[len], '\0',
-			  nonoption_flags_max_len - len);
-		}
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
 	    }
 	}
       nonoption_flags_len = nonoption_flags_max_len;

texinfo/lib/getopt.h

 /* Declarations for getopt.
    Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+   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.  */
 
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
@@ -130,4 +130,4 @@ extern int _getopt_internal ();
 }
 #endif
 
-#endif /* _GETOPT_H */
+#endif /* getopt.h */

texinfo/lib/getopt1.c

 /* getopt_long and getopt_long_only entry points for GNU getopt.
    Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

texinfo/lib/system.h

 /* system.h: System-dependent declarations.  Include this first.
-   $Id: system.h,v 1.2 1998/03/24 18:07:37 law Exp $
+   $Id: system.h,v 1.1.1.2 1998/03/24 18:19:53 law Exp $
 
    Copyright (C) 1997 Free Software Foundation, Inc.
 

texinfo/makeinfo/Makefile.am

 ## Makefile.am for texinfo/makeinfo.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:07:49 law Exp $
+## $Id: Makefile.am,v 1.3 1998/03/24 19:41:22 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 bin_PROGRAMS = makeinfo

texinfo/makeinfo/Makefile.in

-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -43,27 +49,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -91,7 +96,6 @@ EXTRA_DIST = README
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  makeinfo$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -119,9 +123,9 @@ OBJECTS = $(makeinfo_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus makeinfo/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps makeinfo/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -131,7 +135,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -148,7 +152,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	done
 
 uninstall-binPROGRAMS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
@@ -156,37 +160,48 @@ uninstall-binPROGRAMS:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
-makeinfo$(EXEEXT): $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES)
-	@rm -f makeinfo$(EXEEXT)
+makeinfo: $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES)
+	@rm -f makeinfo
 	$(LINK) $(makeinfo_LDFLAGS) $(makeinfo_OBJECTS) $(makeinfo_LDADD) $(LIBS)
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -196,17 +211,20 @@ subdir = makeinfo
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+makeinfo.o: makeinfo.c ../lib/system.h ../config.h ../lib/getopt.h \
+	makeinfo.h
+multi.o: multi.c ../lib/system.h ../config.h makeinfo.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
 install-exec: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 
@@ -227,19 +245,19 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-compile \
 		mostlyclean-tags mostlyclean-generic
 
@@ -248,7 +266,7 @@ clean:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
 
 distclean:  distclean-binPROGRAMS distclean-compile distclean-tags \
 		distclean-generic clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
 		maintainer-clean-tags maintainer-clean-generic \
@@ -261,8 +279,8 @@ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
 install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-info install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

texinfo/makeinfo/README

-A standalone program to convert Texinfo source into Info files
-readable with standalone info or M-x info in Emacs.
-makeinfo can also output plain ASCII.
+makeinfo is a standalone program to convert Texinfo source into Info
+files readable with standalone info or M-x info in Emacs.
 
-The Emacs function M-x texinfo-format-buffer does the same job, but
-makeinfo is faster and gives better error messages.
+makeinfo can also output plain ASCII.  Work to support HTML and Troff
+output is almost complete.
+
+The Emacs function M-x texinfo-format-buffer does more or less the same
+job, but makeinfo is faster and gives better error messages.

texinfo/missing

@@ -80,7 +80,15 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`acconfig.h' or \`configure.in'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    touch config.h.in
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in`
+    if test -z "$files"; then
+      files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in`
+      test -z "$files" || files="$files.in"
+    else
+      files=`echo "$files" | sed -e 's/:/ /g'`
+    fi
+    test -z "$files" && files="config.h.in"
+    touch $files
     ;;
 
   automake)

texinfo/mkinstalldirs

@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.3 1998/03/24 18:05:22 law Exp $
+# $Id: mkinstalldirs,v 1.1.1.2 1998/03/24 18:19:28 law Exp $
 
 errstatus=0
 

texinfo/po/ChangeLog

-Thu Sep  4 15:01:33 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* Makefile.in.in (install-info): Add dummy target.
-
-

texinfo/po/Makefile.in.in

 # Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -35,7 +26,7 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -71,35 +62,19 @@ INSTOBJEXT = @INSTOBJEXT@
 	$(COMPILE) $<
 
 .po.pox:
-	if [ x"@MAINT@" = x ]; then \
-	  $(MAKE) $(PACKAGE).pot; \
-	  $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox; \
-	else \
-	  touch $@; \
-	fi
+	$(MAKE) $(PACKAGE).pot
+	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
 .po.mo:
-	if [ x"@MAINT@" = x ]; then \
-	  $(MSGFMT) -o $@ $<; \
-	else \
-	  touch $@; \
-	fi
+	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	if [ x"@MAINT@" = x ]; then \
-	  file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	    && rm -f $$file && $(GMSGFMT) -o $$file $<; \
-	else \
-	  touch $@; \
-	fi
+	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
-	if [ x"@MAINT@" = x ]; then \
-	  sed -f ../intl/po2msg.sed < $< > $*.msg \
-	    && rm -f $@ && $(GENCAT) $@ $*.msg; \
-	else \
-	  touch $@; \
-	fi
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && $(GENCAT) $@ $*.msg
 
 
 all: all-@USE_NLS@
@@ -107,20 +82,15 @@ all: all-@USE_NLS@
 all-yes: cat-id-tbl.c $(CATALOGS)
 all-no:
 
-$(PACKAGE).pot: @MAINT@ $(POTFILES)
+$(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in
-	if [ ! -s $(PACKAGE).po ] \
-	  || cmp -s $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; then \
-	  rm -f $(PACKAGE).po; \
-	else \
-	  rm -f $(srcdir)/$(PACKAGE).pot \
-	    && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; \
-	fi
+	rm -f $(srcdir)/$(PACKAGE).pot
+	mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
 
-cat-id-tbl.c: stamp-cat-id
-stamp-cat-id: @MAINT@ $(PACKAGE).pot
+$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
+$(srcdir)/stamp-cat-id: $(PACKAGE).pot
 	rm -f cat-id-tbl.tmp
 	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
 		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
@@ -146,11 +116,12 @@ install-data-yes: all
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
 	  case "$$cat" in \
 	    *.gmo) destdir=$(gnulocaledir);; \
 	    *)     destdir=$(localedir);; \
 	  esac; \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r $(MKINSTALLDIRS); then \
 	    $(MKINSTALLDIRS) $$dir; \
@@ -185,8 +156,8 @@ install-data-yes: all
 	  else \
 	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
-	  cd $(srcdir) && \
-	    $(INSTALL_DATA) Makefile.in.in $(gettextsrcdir)/Makefile.in.in; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -197,7 +168,8 @@ installcheck:
 uninstall:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
@@ -209,7 +181,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info install-info tags TAGS ID:
+dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
@@ -223,6 +195,7 @@ distclean: clean
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
+	rm -f $(GMOFILES)
 
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: update-po $(DISTFILES)
@@ -238,7 +211,8 @@ update-po: Makefile
 	cd $(srcdir); \
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  mv $$lang.po $$lang.old.po; \
 	  echo "$$lang:"; \
 	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
@@ -256,9 +230,12 @@ POTFILES: POTFILES.in
 	  else \
 	    posrcprefix="../"; \
 	  fi; \
-	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-	      -e "s@.*@	$$posrcprefix& \\\\@" \
-	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+		| sed -e '$$s/\\$$//') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
 
 Makefile: Makefile.in.in ../config.status POTFILES
 	cd .. \

texinfo/po/POTFILES.in

 # List of source files containing translatable strings.
 # The last line must not be a comment.
 
-info/doc.c
 info/echo-area.c
 info/footnotes.c
+info/footnotes.h
 info/indices.c
 info/info.c
+info/info.h
 info/infodoc.c
 info/m-x.c
 info/makedoc.c
 info/nodemenu.c
-info/nodes.h
 info/session.c
+info/tilde.c
 info/variables.c
 info/window.c
+lib/getopt.c
 makeinfo/makeinfo.c
 makeinfo/multi.c
 util/install-info.c

texinfo/po/cat-id-tbl.c

@@ -498,4 +498,5 @@ Email bug reports to bug-texinfo@prep.ai.mit.edu.", 358},
   {"%s; for file `%s'.\n", 363},
   {"Virtual memory exhausted in %s ()!  Needed %d bytes.", 364},
 };
+
 int _msg_tbl_length = 364;

texinfo/testsuite/configure

 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
+# Generated automatically using autoconf version 2.12.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -49,6 +49,9 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
 
 ac_prev=
 for ac_option
@@ -330,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.12.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -432,11 +435,14 @@ do
 done
 
 # NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -498,6 +504,7 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -530,11 +537,25 @@ cat > confcache <<\EOF
 # --recheck option to rerun configure.
 #
 EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
-  >> confcache
+  case `(ac_space=' '; set) 2>&1 | grep ac_space` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
 if cmp -s $cache_file confcache; then
   :
 else
@@ -601,7 +622,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -620,6 +641,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
@@ -644,20 +666,56 @@ s%@mandir@%$mandir%g
 
 CEOF
 EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
-  # Adjust relative srcdir, etc. for subdirectories.
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -681,6 +739,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
+
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -689,15 +748,21 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-rm -f conftest.subs
+rm -f conftest.s*
 
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 exit 0
 EOF

texinfo/util/Makefile.am

 ## Makefile.am for texinfo/util.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:08:38 law Exp $
+## $Id: Makefile.am,v 1.3 1998/03/24 19:41:36 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
-bin_PROGRAMS = texindex
+bin_PROGRAMS = install-info texindex
 bin_SCRIPTS = texi2dvi
 
-## CYGNUS LOCAL: Build install-inf locally, and install it as
-## install-info, to avoid confusing with the install-info target
-## generated by automake --cygnus.
-noinst_PROGRAMS = install-inf
-install_inf_SOURCES = install-info.c
-
 localedir = $(datadir)/locale
 INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
 LDADD = ../lib/libtxi.a @INTLLIBS@
 
 EXTRA_DIST = README deref.c fixfonts gen-dir-node tex3patch texi2dvi \
              update-info 
-
-install-exec-local: $(noinst_PROGRAMS)
-	$(mkinstalldirs) $(bindir)
-	$(INSTALL_PROGRAM) install-inf$(EXEEXT) $(bindir)/`echo install-info$(EXEEXT)|sed '$(transform)'`; \

texinfo/util/README

 Assorted Texinfo-related programs and scripts.
+
 texindex, texi2dvi, and install-info get installed.
-The other programs are for your amusement.
+The other items here are for your amusement and/or hacking pleasure.

texinfo/util/install-info.c

 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.5 1998/03/24 18:08:44 law Exp $
+   $Id: install-info.c,v 1.1.1.3 1998/03/24 18:20:30 law Exp $
 
-   Copyright (C) 1996, 97 Free Software Foundation, Inc.
+   Copyright (C) 1996, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,10 @@
 #include "system.h"
 #include <getopt.h>
 
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
 /* Name this program was invoked with.  */
 char *progname;
 
@@ -283,8 +287,9 @@ suggest_asking_for_help ()
 void
 print_help ()
 {
-  printf (_("%s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
-  Install INFO-FILE in the Info directory file DIR-FILE.\n\
+  printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
+\n\
+Install INFO-FILE in the Info directory file DIR-FILE.\n\
 \n\
 Options:\n\
 --delete          Delete existing entries in INFO-FILE;\n\
@@ -312,12 +317,14 @@ Options:\n\
                     from information in the Info file itself.\n\
 --version         Display version information and exit.\n\
 \n\
-Email bug reports to bug-texinfo@prep.ai.mit.edu.\n\
+Email bug reports to bug-texinfo@gnu.org.\n\
 "), progname);
 }
+
 
 /* If DIRFILE does not exist, create a minimal one (or abort).  If it
    already exists, do nothing.  */
+
 void
 ensure_dirfile_exists (dirfile)
      char *dirfile;
@@ -335,7 +342,7 @@ ensure_dirfile_exists (dirfile)
 topmost node of the Info hierarchy, called (dir)Top.\n\
 The first time you invoke Info you start off looking at this node.\n\
 \n\
-File: dir       Node: Top       This is the top of the INFO tree\n\
+File: dir,\tNode: Top,\tThis is the top of the INFO tree\n\
 \n\
   This (the Directory node) gives a menu of major topics.\n\
   Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
@@ -368,19 +375,20 @@ File: dir       Node: Top       This is the top of the INFO tree\n\
 
 struct option longopts[] =
 {
-  { "delete",                   no_argument, NULL, 'r' },
-  { "dir-file",                 required_argument, NULL, 'd' },
-  { "entry",                    required_argument, NULL, 'e' },
-  { "help",                     no_argument, NULL, 'h' },
-  { "info-dir",                 required_argument, NULL, 'D' },
-  { "info-file",                required_argument, NULL, 'i' },
-  { "item",                     required_argument, NULL, 'e' },
-  { "quiet",                    no_argument, NULL, 'q' },
-  { "remove",                   no_argument, NULL, 'r' },
-  { "section",                  required_argument, NULL, 's' },
-  { "version",                  no_argument, NULL, 'V' },
+  { "delete",    no_argument, NULL, 'r' },
+  { "dir-file",  required_argument, NULL, 'd' },
+  { "entry",     required_argument, NULL, 'e' },
+  { "help",      no_argument, NULL, 'h' },
+  { "info-dir",  required_argument, NULL, 'D' },
+  { "info-file", required_argument, NULL, 'i' },
+  { "item",      required_argument, NULL, 'e' },
+  { "quiet",     no_argument, NULL, 'q' },
+  { "remove",    no_argument, NULL, 'r' },
+  { "section",   required_argument, NULL, 's' },
+  { "version",   no_argument, NULL, 'V' },
   { 0 }
 };
+
 
 int
 main (argc, argv)
@@ -518,11 +526,12 @@ main (argc, argv)
           break;
 
         case 'V':
-          printf (_("install-info (GNU %s) %s\n"), PACKAGE, VERSION);
-puts (_("Copyright (C) 1996 Free Software Foundation, Inc.\n\
+          printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
+	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING."));
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
           exit (0);
 
         default:
@@ -955,18 +964,49 @@ readfile (filename, sizep)
      char *filename;
      int *sizep;
 {
+  int desc;
   int data_size = 1024;
   char *data = (char *) xmalloc (data_size);
   int filled = 0;
   int nread = 0;
+#ifdef HAVE_LIBZ
+  int isGZ = 0;
+  gzFile zdesc;
+#endif
 
-  int desc = open (filename, O_RDONLY);
+  desc = open (filename, O_RDONLY);
   if (desc < 0)
     pfatal_with_name (filename);
 
+#ifdef HAVE_LIBZ
+  /* The file should always be two bytes long.  */
+  if (read (desc, data, 2) != 2)
+    pfatal_with_name (filename);
+
+  /* Undo that read.  */
+  lseek (desc, 0, SEEK_SET);
+
+  /* If we see gzip magic, use gzdopen. */
+  if (data[0] == '\x1f' && data[1] == '\x8b')
+    {
+      isGZ = 1;
+      zdesc = gzdopen (desc, "r");
+      if (zdesc == NULL) {
+        close (desc);
+        pfatal_with_name (filename);
+      }
+    }
+#endif /* HAVE_LIBZ */
+
   while (1)
     {
-      nread = read (desc, data + filled, data_size - filled);
+#ifdef HAVE_LIBZ
+      if (isGZ)
+	nread = gzread (zdesc, data + filled, data_size - filled);
+      else
+#endif
+        nread = read (desc, data + filled, data_size - filled);
+
       if (nread < 0)
         pfatal_with_name (filename);
       if (nread == 0)
@@ -981,6 +1021,14 @@ readfile (filename, sizep)
     }
 
   *sizep = filled;
+
+#ifdef HAVE_LIBZ
+  if (isGZ)
+    gzclose (zdesc);
+  else
+#endif
+    close(desc);
+
   return data;
 }
 

texinfo/util/texindex.c

 /* Prepare TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.2 1998/03/24 18:08:47 law Exp $
+   $Id: texindex.c,v 1.1.1.3 1998/03/24 18:20:31 law Exp $
 
-   Copyright (C) 1987, 91, 92, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1987, 91, 92, 96, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -43,18 +43,6 @@ char *mktemp ();
 #  define TI_FATAL_ERROR ((1 << 28) | 4)
 #  define unlink delete
 #else /* !VMS */
-#  if defined (HAVE_SYS_FCNTL_H)
-#    include <sys/types.h>
-#    include <sys/fcntl.h>
-#  endif /* HAVE_SYS_FCNTL_H */
-
-#  if defined (_AIX) || !defined (_POSIX_VERSION)
-#    include <sys/file.h>
-#  else /* !AIX && _POSIX_VERSION */
-#    if !defined (HAVE_SYS_FCNTL_H)
-#      include <fcntl.h>
-#    endif /* !HAVE_FCNTL_H */
-#  endif /* !_AIX && _POSIX_VERSION */
 #  define TI_NO_ERROR 0
 #  define TI_FATAL_ERROR 1
 #endif /* !VMS */
@@ -246,6 +234,8 @@ main (argc, argv)
 
   flush_tempfiles (tempcount);
   exit (TI_NO_ERROR);
+  
+  return 0; /* Avoid bogus warnings.  */
 }
 
 typedef struct
@@ -297,7 +287,7 @@ usage (result_value)
 
       fprintf (f, "\t%s\n", _(texindex_options[i].doc_string));
     }
-  puts (_("\nEmail bug reports to bug-texinfo@prep.ai.mit.edu."));
+  puts (_("\nEmail bug reports to bug-texinfo@gnu.org."));
 
   exit (result_value);
 }
@@ -344,11 +334,12 @@ decode_command (argc, argv)
         {
           if (strcmp (arg, "--version") == 0)
             {
-              printf (_("texindex (GNU %s %s) 2.1\n"), PACKAGE, VERSION);
-puts (_("Copyright (C) 1996 Free Software Foundation, Inc.\n\
+              printf ("texindex (GNU %s) %s\n", PACKAGE, VERSION);
+	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING."));
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
               exit (0);
             }
           else if ((strcmp (arg, "--keep") == 0) ||

texinfo/util/update-info

@@ -213,7 +213,7 @@ Options:
 Backup of the info node has a '.old' suffix added.  This is a shell script.
 Files: update-info.f -- contains functions (optional).
 Environment Variables: COLUMNS, EDITOR, LINES, TMPDIR
-Email bug reports to bug-texinfo@prep.ai.mit.edu.
+Email bug reports to bug-texinfo@gnu.org.
 HelpEndOfFile
 		exit;;