Merge in texinfo-3.11.

From-SVN: r18767

1 files changed, 48 insertions, 11 deletions

diff --git a/texinfo/configure.in b/texinfo/configure.in
index c3b5544..ca9fcb1 100644
--- a/texinfo/configure.in
+++ b/texinfo/configure.in
@@ -1,25 +1,39 @@
 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])