Merge in texinfo-3.11.

From-SVN: r18767

texinfo/configure.in

 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.2 1997/09/16 05:01:43 law Exp $
-AC_PREREQ(2.5)
-AC_INIT(texinfo.texi)
+dnl $Id: configure.in,v 1.5 1998/03/24 18:05:13 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])
 
 dnl Checks for programs.
-dnl AC_PROG_GCC_TRADITIONAL
+AC_PROG_CC
+AC_PROG_GCC_TRADITIONAL
 EGCS_PROG_INSTALL
 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='`
+AC_SUBST(TEXMF)
+
 AC_ISC_POSIX
 AC_MINIX
 
-AM_CYGWIN32
+dnl CYGNUS LOCAL: Add AM_MAINTAINER_MODE and AM_EXEEXT
+AM_MAINTAINER_MODE
 AM_EXEEXT
 
 dnl Checks for libraries.
 # Needed on sysV68 for sigblock, sigsetmask.
 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.
 TERMLIBS=
-for termlib in curses ncurses termcap terminfo termlib ; do
+for termlib in ncurses curses termcap terminfo termlib ; do
    AC_CHECK_LIB(${termlib}, tputs,
      [TERMLIBS="${TERMLIBS} -l${termlib}"; break])
 done
@@ -27,22 +41,45 @@ AC_SUBST(TERMLIBS)
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h termios.h termio.h strings.h string.h varargs.h \
-  sys/time.h sys/fcntl.h sys/ttold.h sys/ptem.h sys/file.h)
+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
 AC_C_CONST
 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_CHECK_FUNCS(setvbuf getcwd memset bzero strchr strcasecmp \
-  vfprintf vsprintf strerror sigprocmask sigsetmask)
+  sigprocmask sigsetmask)
 dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
-AC_REPLACE_FUNCS(memcpy memmove strdup)
+AC_REPLACE_FUNCS(memcpy memmove strdup strerror)
+
+dnl Set of available languages and i18n macros.
+ALL_LINGUAS="de fr"
+AM_GNU_GETTEXT
+AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 
-AC_OUTPUT(Makefile libtxi/Makefile makeinfo/Makefile info/Makefile util/Makefile emacs/Makefile)
+AC_OUTPUT([Makefile             \
+           doc/Makefile         \
+           emacs/Makefile       \
+           info/Makefile        \
+           intl/Makefile        \
+           lib/Makefile         \
+           makeinfo/Makefile    \
+           po/Makefile.in       \
+           util/Makefile        \
+           ],
+          [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in >po/Makefile])

texinfo/info/man.c

-/*  man.c: How to read and format man files. */
+/*  man.c: How to read and format man files.
+    $Id: man.c,v 1.4 1998/03/22 21:47:54 law Exp $
 
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 97 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
@@ -23,7 +21,6 @@
 
 #include "info.h"
 #include <sys/ioctl.h>
-#include <sys/file.h>
 #include "signals.h"
 #if defined (HAVE_SYS_TIME_H)
 #include <sys/time.h>
@@ -31,8 +28,8 @@
 #if defined (HAVE_SYS_WAIT_H)
 #include <sys/wait.h>
 #endif
-#include "tilde.h"
 
+#include "tilde.h"
 #include "man.h"
 
 #if !defined (SIGCHLD) && defined (SIGCLD)
@@ -116,12 +113,9 @@ get_manpage_node (file_buffer, pagename)
 FILE_BUFFER *
 create_manpage_file_buffer ()
 {
-  FILE_BUFFER *file_buffer;
-  struct stat *finfo;
-
-  file_buffer = make_file_buffer ();
-  file_buffer->filename = strdup (MANPAGE_FILE_BUFFER_NAME);
-  file_buffer->fullpath = strdup (MANPAGE_FILE_BUFFER_NAME);
+  FILE_BUFFER *file_buffer = make_file_buffer ();
+  file_buffer->filename = xstrdup (MANPAGE_FILE_BUFFER_NAME);
+  file_buffer->fullpath = xstrdup (MANPAGE_FILE_BUFFER_NAME);
   file_buffer->finfo.st_size = 0;
   file_buffer->filesize = 0;
   file_buffer->contents = (char *)NULL;
@@ -143,9 +137,8 @@ executable_file_in_path (filename, path)
 
   dirname_index = 0;
 
-  while (temp_dirname = extract_colon_unit (path, &dirname_index))
+  while ((temp_dirname = extract_colon_unit (path, &dirname_index)))
     {
-      register int i;
       char *temp;
 
       /* Expand a leading tilde if one is present. */
@@ -227,7 +220,7 @@ static void
 reap_children (sig)
      int sig;
 {
-  unsigned int status;
+  int status;
   wait (&status);
 }
 
@@ -239,7 +232,6 @@ get_manpage_contents (pagename)
   int pipes[2];
   pid_t child;
   char *formatted_page = (char *)NULL;
-  char *section = (char *)NULL;
   int arg_index = 1;
 
   if (formatter_args[0] == (char *)NULL)
@@ -310,7 +302,7 @@ clean_manpage (manpage)
 
   newpage = (char *)xmalloc (1 + strlen (manpage));
 
-  for (i = 0, j = 0; newpage[j] = manpage[i]; i++, j++)
+  for (i = 0, j = 0; (newpage[j] = manpage[i]); i++, j++)
     {
       if (manpage[i] == '\n')
         newline_count++;
@@ -345,7 +337,7 @@ manpage_node_of_file_buffer (file_buffer, pagename)
     {
       register int i;
 
-      for (i = 0; tag = file_buffer->tags[i]; i++)
+      for (i = 0; (tag = file_buffer->tags[i]); i++)
         {
           if (strcasecmp (pagename, tag->nodename) == 0)
             break;
@@ -543,8 +535,8 @@ xrefs_of_manpage (node)
           entry->label = (char *)xmalloc (1 + len);
           strncpy (entry->label, (reference_section->buffer) + start, len);
           entry->label[len] = '\0';
-	  entry->filename = strdup (node->filename);
-	  entry->nodename = strdup (entry->label);
+          entry->filename = xstrdup (node->filename);
+          entry->nodename = xstrdup (entry->label);
           entry->start = start;
           entry->end = end;
 
@@ -564,7 +556,6 @@ locate_manpage_xref (node, start, dir)
      long start;
      int dir;
 {
-  register int i, count;
   REFERENCE **refs;
   long position = -1;
 
@@ -580,7 +571,7 @@ locate_manpage_xref (node, start, dir)
 
       if (dir > 0)
         {
-	  for (i = 0; entry = refs[i]; i++)
+          for (i = 0; (entry = refs[i]); i++)
             if (entry->start > start)
               {
                 position = entry->start;
@@ -628,7 +619,7 @@ manpage_xrefs_in_binding (node, binding)
   start = binding->start + (binding->buffer - node->contents);
   end = binding->end + (binding->buffer - node->contents);
 
-  for (i = 0; entry = all_refs[i]; i++)
+  for (i = 0; (entry = all_refs[i]); i++)
     {
       if ((entry->start > start) && (entry->end < end))
         {

texinfo/info/termdep.h

 /* termdep.h -- System things that terminal.c depends on.
-   $Id: termdep.h,v 1.2 1997/10/30 05:55:14 law Exp $
+   $Id: termdep.h,v 1.4 1998/03/24 18:06:50 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 96 Free Software Foundation, Inc.
+   Copyright (C) 1993, 96, 97 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,32 +22,20 @@
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
-#if !defined (_TERMDEP_H_)
-#  define _TERMDEP_H_
+#ifndef INFO_TERMDEP_H
+#define INFO_TERMDEP_H
 
-#if defined (HAVE_SYS_FCNTL_H)
-#  include <sys/fcntl.h>
-#else
-#  include <fcntl.h>
-#endif /* !HAVE_SYS_FCNTL_H */
-
-#if defined (HAVE_SYS_FILE_H)
-#  include <sys/file.h>
-#endif /* HAVE_SYS_FILE_H */
-
-#if defined (HAVE_STRINGS_H)
-#  include <strings.h>
-#else
-#  if defined (HAVE_STRING_H)
-#    include <string.h>
-#  endif
+/* NeXT supplies <termios.h> but it is broken.  Probably Autoconf should
+   have a separate test, but anyway ... */
+#ifdef NeXT
+#undef HAVE_TERMIOS_H
 #endif
 
-#if defined (HAVE_TERMIOS_H)
+#ifdef HAVE_TERMIOS_H
 #  include <termios.h>
-/* 
- * POSIX does not mandate that we have these and it may, in fact, be only
- * partially implemented 
+ /*
+    POSIX does not mandate that we have these and it may, in fact, be only
+    partially implemented.
   */
 #  undef TIOCGETC
 #else
@@ -67,15 +55,8 @@
 #  endif /* !HAVE_TERMIO_H */
 #endif /* !HAVE_TERMIOS_H */
 
-#if defined (HAVE_SYS_TTOLD_H)
+#ifdef HAVE_SYS_TTOLD_H
 #  include <sys/ttold.h>
 #endif /* HAVE_SYS_TTOLD_H */
 
-#if !defined (HAVE_STRCHR)
-#  undef strchr
-#  undef strrchr
-#  define strchr index
-#  define strrchr rindex
-#endif /* !HAVE_STRCHR */
-
-#endif /* _TERMDEP_H_ */
+#endif /* not INFO_TERMDEP_H */

texinfo/info/terminal.c

-/* terminal.c -- How to handle the physical terminal for Info. */
+/* terminal.c -- How to handle the physical terminal for Info.
+   $Id: terminal.c,v 1.4 1998/03/24 18:06:53 law Exp $
 
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   This file has appeared in prior works by the Free Software Foundation;
-   thus it carries copyright dates from 1988 through 1993.
-
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96 Free Software Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97 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
@@ -24,19 +20,33 @@
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
-#include <stdio.h>
-#include <sys/types.h>
+#include "info.h"
 #include "terminal.h"
 #include "termdep.h"
 
-extern void *xmalloc (), *xrealloc ();
+#include <sys/types.h>
+#include <signal.h>
 
 /* The Unix termcap interface code. */
+#ifdef HAVE_NCURSES_TERMCAP_H
+#include <ncurses/termcap.h>
+#else
+#ifdef HAVE_TERMCAP_H
+#include <termcap.h>
+#else
+/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
+   Unfortunately, PC is a global variable used by the termcap library. */
+#undef PC
 
+/* Termcap requires these variables, whether we access them or not. */
+char *BC, *UP;
+char PC;      /* Pad character */
+short ospeed; /* Terminal output baud rate */
 extern int tgetnum (), tgetflag (), tgetent ();
 extern char *tgetstr (), *tgoto ();
-extern char *getenv ();
 extern void tputs ();
+#endif /* not HAVE_TERMCAP_H */
+#endif /* not HAVE_NCURSES_TERMCAP_H */
 
 /* Function "hooks".  If you make one of these point to a function, that
    function is called when appropriate instead of its namesake.  Your
@@ -65,15 +75,6 @@ VFunction *terminal_scroll_terminal_hook = (VFunction *)NULL;
 /*                                                                  */
 /* **************************************************************** */
 
-/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
-   Unfortunately, PC is a global variable used by the termcap library. */
-#undef PC
-
-/* TERMCAP requires these variables, whether we access them or not. */
-char PC;
-char *BC, *UP;
-short ospeed;
-
 /* A buffer which holds onto the current terminal description, and a pointer
    used to float within it. */
 static char *term_buffer = (char *)NULL;
@@ -84,6 +85,8 @@ static char *term_goto, *term_clreol, *term_cr, *term_clrpag;
 static char *term_begin_use, *term_end_use;
 static char *term_AL, *term_DL, *term_al, *term_dl;
 
+static char *term_keypad_on, *term_keypad_off;
+
 /* How to go up a line. */
 static char *term_up;
 
@@ -108,11 +111,15 @@ static char *term_invbeg;
 /* The string to turn off inverse mode, if this term has one. */
 static char *term_invend;
 
-static void
+/* Although I can't find any documentation that says this is supposed to
+   return its argument, all the code I've looked at (termutils, less)
+   does so, so fine.  */
+static int
 output_character_function (c)
      int c;
 {
   putc (c, stdout);
+  return c;
 }
 
 /* Macro to send STRING to the terminal. */
@@ -126,15 +133,43 @@ output_character_function (c)
 static void
 terminal_begin_using_terminal ()
 {
+  RETSIGTYPE (*sigsave) ();
+
+  if (term_keypad_on)
+      send_to_terminal (term_keypad_on);
+  
+  if (!term_begin_use || !*term_begin_use)
+    return;
+
+  sigsave = signal (SIGWINCH, SIG_IGN); 
   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
+     not restored properly.
+     From: strube@physik3.gwdg.de (Hans Werner Strube).  */
+  fflush (stdout);
+  sleep (1);
+  signal (SIGWINCH, sigsave);
 }
 
-/* Tell the terminal that we will not be doing any more cursor addressable
-   motion. */
+/* Tell the terminal that we will not be doing any more cursor
+   addressable motion. */
 static void
 terminal_end_using_terminal ()
 {
+  RETSIGTYPE (*sigsave) ();
+
+  if (term_keypad_off)
+      send_to_terminal (term_keypad_off);
+  
+  if (!term_end_use || !*term_end_use)
+    return;
+
+  sigsave = signal (SIGWINCH, SIG_IGN);
   send_to_terminal (term_end_use);
+  fflush (stdout);
+  sleep (1);
+  signal (SIGWINCH, sigsave);
 }
 
 /* **************************************************************** */
@@ -169,6 +204,8 @@ char *term_ku = (char *)NULL;
 char *term_kd = (char *)NULL;
 char *term_kr = (char *)NULL;
 char *term_kl = (char *)NULL;
+char *term_kP = (char *)NULL;   /* page-up */
+char *term_kN = (char *)NULL;   /* page-down */
 
 /* Move the cursor to the terminal location of X and Y. */
 void
@@ -457,12 +494,12 @@ terminal_get_screen_size ()
     }
 }
 
-/* Initialize the terminal which is known as TERMINAL_NAME.  If this terminal
-   doesn't have cursor addressability, TERMINAL_IS_DUMB_P becomes non-zero.
-   The variables SCREENHEIGHT and SCREENWIDTH are set to the dimensions that
-   this terminal actually has.  The variable TERMINAL_HAS_META_P becomes non-
-   zero if this terminal supports a Meta key.  Finally, the terminal screen is
-   cleared. */
+/* Initialize the terminal which is known as TERMINAL_NAME.  If this
+   terminal doesn't have cursor addressability, `terminal_is_dumb_p'
+   becomes nonzero.  The variables SCREENHEIGHT and SCREENWIDTH are set
+   to the dimensions that this terminal actually has.  The variable
+   TERMINAL_HAS_META_P becomes nonzero if this terminal supports a Meta
+   key.  Finally, the terminal screen is cleared. */
 void
 terminal_initialize_terminal (terminal_name)
      char *terminal_name;
@@ -500,6 +537,7 @@ terminal_initialize_terminal (terminal_name)
       term_cr = "\r";
       term_up = term_dn = audible_bell = visible_bell = (char *)NULL;
       term_ku = term_kd = term_kl = term_kr = (char *)NULL;
+      term_kP = term_kN = (char *)NULL;
       return;
     }
 
@@ -553,6 +591,9 @@ terminal_initialize_terminal (terminal_name)
   term_begin_use = tgetstr ("ti", &buffer);
   term_end_use = tgetstr ("te", &buffer);
 
+  term_keypad_on = tgetstr ("ks", &buffer);
+  term_keypad_off = tgetstr ("ke", &buffer);
+
   /* Check to see if this terminal has a meta key. */
   terminal_has_meta_p = (tgetflag ("km") || tgetflag ("MT"));
   if (terminal_has_meta_p)
@@ -572,11 +613,12 @@ terminal_initialize_terminal (terminal_name)
   term_kr = tgetstr ("kr", &buffer);
   term_kl = tgetstr ("kl", &buffer);
 
+  term_kP = tgetstr ("kP", &buffer);
+  term_kN = tgetstr ("kN", &buffer);
+
   /* If this terminal is not cursor addressable, then it is really dumb. */
   if (!term_goto)
     terminal_is_dumb_p = 1;
-
-  terminal_begin_using_terminal ();
 }
 
 /* **************************************************************** */
@@ -623,6 +665,8 @@ terminal_prep_terminal ()
       return;
     }
 
+  terminal_begin_using_terminal ();
+
   tty = fileno (stdin);
 
 #if defined (HAVE_TERMIOS_H)
@@ -655,7 +699,12 @@ terminal_prep_terminal ()
 
   if (ttybuff.c_cc[VQUIT] == '\177')
     ttybuff.c_cc[VQUIT] = -1;
-#endif
+
+#ifdef VLNEXT
+  if (ttybuff.c_cc[VLNEXT] == '\026')
+    ttybuff.c_cc[VLNEXT] = -1;
+#endif /* VLNEXT */
+#endif /* TERMIOS or TERMIO */
 
 #if defined (HAVE_TERMIOS_H)
   tcsetattr (tty, TCSANOW, &ttybuff);