diff options
| author | christos <christos@NetBSD.org> | 2008-09-02 08:00:24 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2008-09-02 08:00:24 +0000 |
| commit | 834f5c54aa22ee8f775792fefb9efded61527fa2 (patch) | |
| tree | 04a22bbc94c2f034ccc57dd5f5ab2d2be240a1f1 /gnu | |
| parent | 14e22615fd3ae4a4c00a5a3f5be8034e69889f2a (diff) | |
resolve conflicts.
Diffstat (limited to 'gnu')
31 files changed, 1108 insertions, 1062 deletions
diff --git a/gnu/dist/texinfo/Makefile.in b/gnu/dist/texinfo/Makefile.in index 5a3aac7e4ec..09d5fd1792e 100644 --- a/gnu/dist/texinfo/Makefile.in +++ b/gnu/dist/texinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile.am for texinfo. -# Id: Makefile.am,v 1.3 2004/02/24 01:17:11 karl Exp +# Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp # Process this file with automake to produce Makefile.in in all directories. # # This file is free software; as a special exception the author gives @@ -45,6 +45,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.in \ @@ -87,7 +88,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = @native_tools@ intl m4 lib info makeinfo po util doc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -135,6 +136,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -169,6 +172,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -181,6 +186,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -202,6 +209,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -214,19 +222,16 @@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.8 readme-alpha # Additional files to distribute. -EXTRA_DIST = INSTALL.generic INTRODUCTION config.rpath \ +EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev \ + config.rpath \ djgpp/README djgpp/config.bat djgpp/config.sed djgpp/config.site # This is to prevent texinfo.tex from being included in the top-level # distribution directory. TEXINFO_TEX = doc/texinfo.tex - -# All subdirectories. -# Do intl, m4, 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 m4 lib info makeinfo po util doc +@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc +@TOOLS_ONLY_TRUE@SUBDIRS = lib info makeinfo util # for gettext. ACLOCAL_AMFLAGS = -I m4 @@ -367,14 +372,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -384,9 +391,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -440,15 +449,17 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -459,14 +470,14 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -479,8 +490,8 @@ dist-zip: distdir $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -489,13 +500,13 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -556,7 +567,7 @@ check: check-recursive all-am: Makefile config.h installdirs: installdirs-recursive installdirs-am: -install: install-recursive +@TOOLS_ONLY_FALSE@install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -575,7 +586,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -587,7 +598,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags +distclean-am: clean-am distclean-generic distclean-hdr distclean-local \ + distclean-tags dvi: dvi-recursive @@ -635,21 +647,33 @@ uninstall-info: uninstall-info-recursive check-am clean clean-generic clean-recursive ctags \ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am - + distclean-hdr distclean-local distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am + + +@TOOLS_ONLY_TRUE@ # Build native tools only. +@TOOLS_ONLY_FALSE@ # All subdirectories. +@TOOLS_ONLY_FALSE@ # Do intl, m4, and lib first since the C programs depend on them. +@TOOLS_ONLY_FALSE@ # Do doc last so makeinfo will be built when we get there. +@TOOLS_ONLY_FALSE@ # Others are alphabetical. # One special target for installers to use by hand if desired. install-tex: cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex + +distclean-local: + -test -d "$(native_tools)" && rm -rf "$(native_tools)" + +# Don't install native tools for cross compile. +@TOOLS_ONLY_TRUE@install: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gnu/dist/texinfo/aclocal.m4 b/gnu/dist/texinfo/aclocal.m4 index 9cb807e24ff..aae5484d262 100644 --- a/gnu/dist/texinfo/aclocal.m4 +++ b/gnu/dist/texinfo/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.4 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -33,14 +33,14 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) + [AM_AUTOMAKE_VERSION([1.9.4])]) # AM_AUX_DIR_EXPAND @@ -108,7 +108,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2001, 2003, 2004 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 @@ -145,8 +145,8 @@ else fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) # serial 7 -*- Autoconf -*- @@ -266,9 +266,14 @@ AC_CACHE_CHECK([dependency style of $depcc], grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -314,7 +319,8 @@ AC_SUBST([AMDEPBACKSLASH]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# 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 @@ -350,27 +356,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -401,7 +401,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much some checks are only needed if # your package does certain things. But this isn't really a big deal. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -477,7 +477,6 @@ AM_MISSING_PROG(AUTOCONF, autoconf) AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -486,7 +485,9 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -769,13 +770,21 @@ fi # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -941,6 +950,114 @@ fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004 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. + +# serial 1 + + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + m4_include([m4/codeset.m4]) m4_include([m4/gettext.m4]) m4_include([m4/glibc21.m4]) diff --git a/gnu/dist/texinfo/configure b/gnu/dist/texinfo/configure index c4f86d9e8d6..fd5d71f5d68 100755 --- a/gnu/dist/texinfo/configure +++ b/gnu/dist/texinfo/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Texinfo 4.7. +# Generated by GNU Autoconf 2.59 for GNU Texinfo 4.8. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU Texinfo' PACKAGE_TARNAME='texinfo' -PACKAGE_VERSION='4.7' -PACKAGE_STRING='GNU Texinfo 4.7' +PACKAGE_VERSION='4.8' +PACKAGE_STRING='GNU Texinfo 4.8' PACKAGE_BUGREPORT='' ac_unique_file="makeinfo/makeinfo.c" @@ -310,7 +310,7 @@ ac_includes_default="\ #endif" gl_header_list= -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB HELP2MAN ALLOCA LIBOBJS build build_cpu build_vendor build_os TERMLIBS host host_cpu host_vendor host_os MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB HELP2MAN ALLOCA LIBOBJS build build_cpu build_vendor build_os native_tools TOOLS_ONLY_TRUE TOOLS_ONLY_FALSE TERMLIBS host host_cpu host_vendor host_os INSTALL_WARNINGS_TRUE INSTALL_WARNINGS_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Texinfo 4.7 to adapt to many kinds of systems. +\`configure' configures GNU Texinfo 4.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -845,7 +845,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Texinfo 4.7:";; + short | recursive ) echo "Configuration of GNU Texinfo 4.8:";; esac cat <<\_ACEOF @@ -856,7 +856,8 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-multiplatform put executables in bin/PLATFORM + --enable-multiplatform put executables in bin/PLATFORM + --disable-install-warnings omit make install warnings about TeX files --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths @@ -977,7 +978,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU Texinfo configure 4.7 +GNU Texinfo configure 4.8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -991,7 +992,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Texinfo $as_me 4.7, which was +It was created by GNU Texinfo $as_me 4.8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1333,7 +1334,7 @@ gl_header_list="$gl_header_list unistd.h" ac_config_headers="$ac_config_headers config.h:config.in" # Keep filename to 8.3 for MS-DOS. -am__api_version="1.8" +am__api_version="1.9" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1510,13 +1511,21 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1632,7 +1641,7 @@ fi # Define the identity of the package. PACKAGE='texinfo' - VERSION='4.7' + VERSION='4.8' cat >>confdefs.h <<_ACEOF @@ -1660,9 +1669,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1755,6 +1761,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2878,9 +2891,14 @@ else grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6337,6 +6355,53 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +# We need to run some of our own binaries, most notably makedoc, but as +# long as we have this process, we also use our own makeinfo and +# install-info. +# +# This means that if we are cross compiling, we have to configure the +# package twice: once with the native compiler (this is done in a +# subdirectory $native_tools), and once with the cross compiler. +# The former is invoked automatically here, with --host=$build. +# $native_tools is also added to SUBDIRS in the main Makefile.am, +# so that make compiles the native tools first. +# +if test "$cross_compiling" = no; then + native_tools= +else + native_tools=tools + test -d "$native_tools" || mkdir "$native_tools" + confdir=`(cd "$srcdir";pwd)` + # Make sure the secondary configure won't fail with + # "error: source directory already configured". + rm -f config.status + { echo "$as_me:$LINENO: Doing configure of native tools (${build})." >&5 +echo "$as_me: Doing configure of native tools (${build})." >&6;} + cd "$native_tools" || exit 1 + # Run secondary configure in alternate environment or + # it gets the wrong CC etc. env -i gives this build host configure + # a clean environment. + env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \ + PATH="${PATH}" \ + tools_only=1 \ + ${confdir}/configure --build=${build} --host=${build} \ + --disable-rpath --disable-nls + cd .. || exit 1 + { echo "$as_me:$LINENO: Continuing with main configure (${host})." >&5 +echo "$as_me: Continuing with main configure (${host})." >&6;} +fi + + + +if test "x$tools_only" = x1; then + TOOLS_ONLY_TRUE= + TOOLS_ONLY_FALSE='#' +else + TOOLS_ONLY_TRUE='#' + TOOLS_ONLY_FALSE= +fi + + # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but # rather ncurses. So we check for it. TERMLIBS= @@ -6916,7 +6981,7 @@ fi echo "$as_me:$LINENO: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 -if test "${jm_ac_cv_header_inttypes_h+set}" = set; then +if test "${gl_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -6957,18 +7022,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - jm_ac_cv_header_inttypes_h=yes + gl_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -jm_ac_cv_header_inttypes_h=no +gl_cv_header_inttypes_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5 -echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6 - if test $jm_ac_cv_header_inttypes_h = yes; then +echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5 +echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6 + if test $gl_cv_header_inttypes_h = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_INTTYPES_H_WITH_UINTMAX 1 @@ -6979,7 +7044,7 @@ _ACEOF echo "$as_me:$LINENO: checking for stdint.h" >&5 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 -if test "${jm_ac_cv_header_stdint_h+set}" = set; then +if test "${gl_cv_header_stdint_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -7020,18 +7085,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - jm_ac_cv_header_stdint_h=yes + gl_cv_header_stdint_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -jm_ac_cv_header_stdint_h=no +gl_cv_header_stdint_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 -echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 - if test $jm_ac_cv_header_stdint_h = yes; then +echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5 +echo "${ECHO_T}$gl_cv_header_stdint_h" >&6 + if test $gl_cv_header_stdint_h = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_STDINT_H_WITH_UINTMAX 1 @@ -7106,7 +7171,7 @@ _ACEOF - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then test $ac_cv_type_unsigned_long_long = yes \ && ac_type='unsigned long long' \ @@ -7237,16 +7302,16 @@ done if test $ac_cv_func_mkstemp = no; then - utils_cv_func_mkstemp_limitations=yes + gl_cv_func_mkstemp_limitations=yes else echo "$as_me:$LINENO: checking for mkstemp limitations" >&5 echo $ECHO_N "checking for mkstemp limitations... $ECHO_C" >&6 -if test "${utils_cv_func_mkstemp_limitations+set}" = set; then +if test "${gl_cv_func_mkstemp_limitations+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - utils_cv_func_mkstemp_limitations=yes + gl_cv_func_mkstemp_limitations=yes else cat >conftest.$ac_ext <<_ACEOF @@ -7283,25 +7348,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - utils_cv_func_mkstemp_limitations=no + gl_cv_func_mkstemp_limitations=no else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -utils_cv_func_mkstemp_limitations=yes +gl_cv_func_mkstemp_limitations=yes fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $utils_cv_func_mkstemp_limitations" >&5 -echo "${ECHO_T}$utils_cv_func_mkstemp_limitations" >&6 +echo "$as_me:$LINENO: result: $gl_cv_func_mkstemp_limitations" >&5 +echo "${ECHO_T}$gl_cv_func_mkstemp_limitations" >&6 fi - if test $utils_cv_func_mkstemp_limitations = yes; then + if test $gl_cv_func_mkstemp_limitations = yes; then case $LIBOBJS in "mkstemp.$ac_objext" | \ *" mkstemp.$ac_objext" | \ @@ -7633,10 +7698,37 @@ if test "${enable_multiplatform+set}" = set; then enableval="$enable_multiplatform" fi; +# if enable_multiplatform is set in the environment, use that. test "x$enable_multiplatform" = xyes \ && test "x$bindir" = 'x${exec_prefix}/bin' \ && bindir="$bindir/$host" +# Taken from the example in +# http://www.gnu.org/software/automake/manual/html_node/Conditionals.html. +# Check whether --enable-install-warnings or --disable-install-warnings was given. +if test "${enable_install_warnings+set}" = set; then + enableval="$enable_install_warnings" + case "${enableval}" in + yes) install_warnings=true ;; + no) install_warnings=false ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-install-warnings" >&5 +echo "$as_me: error: bad value ${enableval} for --enable-install-warnings" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + install_warnings=true +fi; + + +if test x"$install_warnings" = xtrue || test x"$install_warnings" = xyes; then + INSTALL_WARNINGS_TRUE= + INSTALL_WARNINGS_FALSE='#' +else + INSTALL_WARNINGS_TRUE='#' + INSTALL_WARNINGS_FALSE= +fi + + # i18n support. To update to a new version of gettext, run: # gettextize -f -c --intl @@ -13249,6 +13341,20 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${TOOLS_ONLY_TRUE}" && test -z "${TOOLS_ONLY_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"TOOLS_ONLY\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"TOOLS_ONLY\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${INSTALL_WARNINGS_TRUE}" && test -z "${INSTALL_WARNINGS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"INSTALL_WARNINGS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"INSTALL_WARNINGS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -13520,7 +13626,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GNU Texinfo $as_me 4.7, which was +This file was extended by GNU Texinfo $as_me 4.8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13583,7 +13689,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU Texinfo config.status 4.7 +GNU Texinfo config.status 4.8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -13809,7 +13915,6 @@ s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t -s,@AMTAR@,$AMTAR,;t t s,@install_sh@,$install_sh,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -13818,6 +13923,9 @@ s,@mkdir_p@,$mkdir_p,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@am__leading_dot@,$am__leading_dot,;t t +s,@AMTAR@,$AMTAR,;t t +s,@am__tar@,$am__tar,;t t +s,@am__untar@,$am__untar,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t @@ -13848,11 +13956,16 @@ s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t s,@build_os@,$build_os,;t t +s,@native_tools@,$native_tools,;t t +s,@TOOLS_ONLY_TRUE@,$TOOLS_ONLY_TRUE,;t t +s,@TOOLS_ONLY_FALSE@,$TOOLS_ONLY_FALSE,;t t s,@TERMLIBS@,$TERMLIBS,;t t s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t +s,@INSTALL_WARNINGS_TRUE@,$INSTALL_WARNINGS_TRUE,;t t +s,@INSTALL_WARNINGS_FALSE@,$INSTALL_WARNINGS_FALSE,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t @@ -14502,27 +14615,21 @@ echo X"$mf" | else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff --git a/gnu/dist/texinfo/configure.ac b/gnu/dist/texinfo/configure.ac index edf54acb6f6..0e7cd44af06 100644 --- a/gnu/dist/texinfo/configure.ac +++ b/gnu/dist/texinfo/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Id: configure.ac,v 1.12 2004/04/07 20:18:21 karl Exp +# Id: configure.ac,v 1.50 2004/12/22 13:29:44 karl Exp # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -11,7 +11,7 @@ # AC_PREREQ(2.59)# Minimum Autoconf version required. # -AC_INIT([GNU Texinfo], [4.7]) +AC_INIT([GNU Texinfo], [4.8]) AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS. AC_CONFIG_SRCDIR([makeinfo/makeinfo.c]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -79,6 +79,42 @@ gl_STRCASE # term library. AC_CANONICAL_BUILD +# We need to run some of our own binaries, most notably makedoc, but as +# long as we have this process, we also use our own makeinfo and +# install-info. +# +# This means that if we are cross compiling, we have to configure the +# package twice: once with the native compiler (this is done in a +# subdirectory $native_tools), and once with the cross compiler. +# The former is invoked automatically here, with --host=$build. +# $native_tools is also added to SUBDIRS in the main Makefile.am, +# so that make compiles the native tools first. +# +if test "$cross_compiling" = no; then + native_tools= +else + native_tools=tools + test -d "$native_tools" || mkdir "$native_tools" + confdir=`(cd "$srcdir";pwd)` + # Make sure the secondary configure won't fail with + # "error: source directory already configured". + rm -f config.status + AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) + cd "$native_tools" || exit 1 + # Run secondary configure in alternate environment or + # it gets the wrong CC etc. env -i gives this build host configure + # a clean environment. + env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \ + PATH="${PATH}" \ + tools_only=1 \ + ${confdir}/configure --build=${build} --host=${build} \ + --disable-rpath --disable-nls + cd .. || exit 1 + AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) +fi +AC_SUBST(native_tools) +AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) + # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but # rather ncurses. So we check for it. TERMLIBS= @@ -144,16 +180,30 @@ if test "x$termlib" = xncurses; then fi # gnulib. -UTILS_FUNC_MKSTEMP +gl_FUNC_MKSTEMP # For teTeX and TeX Live. AC_CANONICAL_HOST AC_ARG_ENABLE(multiplatform, - [ --enable-multiplatform put executables in bin/PLATFORM]) + [ --enable-multiplatform put executables in bin/PLATFORM]) +# if enable_multiplatform is set in the environment, use that. test "x$enable_multiplatform" = xyes \ && test "x$bindir" = 'x${exec_prefix}/bin' \ && bindir="$bindir/$host" +# Taken from the example in +# http://www.gnu.org/software/automake/manual/html_node/Conditionals.html. +AC_ARG_ENABLE(install-warnings, + [ --disable-install-warnings omit make install warnings about TeX files], + [case "${enableval}" in + yes) install_warnings=true ;; + no) install_warnings=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-install-warnings) ;; + esac], + [install_warnings=true]) +AM_CONDITIONAL(INSTALL_WARNINGS, + test x"$install_warnings" = xtrue || test x"$install_warnings" = xyes) + # i18n support. To update to a new version of gettext, run: # gettextize -f -c --intl AM_GNU_GETTEXT_VERSION(0.14.1) diff --git a/gnu/dist/texinfo/doc/Makefile.in b/gnu/dist/texinfo/doc/Makefile.in index d36f795bcc9..35d97aa1f8f 100644 --- a/gnu/dist/texinfo/doc/Makefile.in +++ b/gnu/dist/texinfo/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Id: Makefile.am,v 1.1.1.1 2003/12/06 01:31:15 karl Exp +# Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp # Makefile.am for texinfo/doc. # Run automake in .. to produce Makefile.in from this. # @@ -45,6 +45,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ subdir = doc DIST_COMMON = README $(info_TEXINFOS) $(srcdir)/Makefile.am \ @@ -87,7 +88,8 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) DVIPS = dvips -am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" +am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(man5dir)" man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 NROFF = nroff @@ -130,6 +132,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -147,8 +151,9 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -# Use the programs built in our distribution. -MAKEINFO = ../makeinfo/makeinfo +# Use the programs built in our distribution, taking account of possible +# cross-compiling. +MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -166,6 +171,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -178,6 +185,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -199,6 +208,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -213,7 +223,7 @@ DISTCLEANFILES = texinfo texinfo-* info*.info* man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \ info.5 texinfo.5 -INSTALL_INFO = ../util/install-info +INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \ txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex @@ -264,14 +274,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh texinfo: texinfo.txi $(srcdir)/version.texi - restore=: && \ - backupdir="$(am__leading_dot)am$$$$" && \ + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then \ - mv $$f $$backupdir; \ - restore=mv; \ - fi; \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ done; \ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $@ `test -f 'texinfo.txi' || echo '$(srcdir)/'`texinfo.txi; \ @@ -281,8 +287,7 @@ texinfo: texinfo.txi $(srcdir)/version.texi rc=$$?; \ $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ fi; \ - rm -rf $$backupdir; \ - exit $$rc + rm -rf $$backupdir; exit $$rc texinfo.dvi: texinfo.txi $(srcdir)/version.texi TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ @@ -295,10 +300,18 @@ texinfo.pdf: texinfo.txi $(srcdir)/version.texi $(TEXI2PDF) -o $@ `test -f 'texinfo.txi' || echo '$(srcdir)/'`texinfo.txi texinfo.html: texinfo.txi $(srcdir)/version.texi - $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ `test -f 'texinfo.txi' || echo '$(srcdir)/'`texinfo.txi - if test ! -d $@ && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else :; fi + rm -rf $(@:.html=.htp) + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $(@:.html=.htp) `test -f 'texinfo.txi' || echo '$(srcdir)/'`texinfo.txi; \ + then \ + rm -rf $@; \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + else \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + exit 1; \ + fi $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti $(srcdir)/stamp-vti: texinfo.txi $(top_srcdir)/configure @(dir=.; test -f ./texinfo.txi || dir=$(srcdir); \ @@ -320,14 +333,10 @@ maintainer-clean-vti: @MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi info-stnd.info: info-stnd.texi $(srcdir)/version-stnd.texi - restore=: && \ - backupdir="$(am__leading_dot)am$$$$" && \ + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then \ - mv $$f $$backupdir; \ - restore=mv; \ - fi; \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ done; \ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $@ `test -f 'info-stnd.texi' || echo '$(srcdir)/'`info-stnd.texi; \ @@ -337,8 +346,7 @@ info-stnd.info: info-stnd.texi $(srcdir)/version-stnd.texi rc=$$?; \ $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ fi; \ - rm -rf $$backupdir; \ - exit $$rc + rm -rf $$backupdir; exit $$rc info-stnd.dvi: info-stnd.texi $(srcdir)/version-stnd.texi TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ @@ -351,10 +359,18 @@ info-stnd.pdf: info-stnd.texi $(srcdir)/version-stnd.texi $(TEXI2PDF) -o $@ `test -f 'info-stnd.texi' || echo '$(srcdir)/'`info-stnd.texi info-stnd.html: info-stnd.texi $(srcdir)/version-stnd.texi - $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ `test -f 'info-stnd.texi' || echo '$(srcdir)/'`info-stnd.texi - if test ! -d $@ && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else :; fi + rm -rf $(@:.html=.htp) + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $(@:.html=.htp) `test -f 'info-stnd.texi' || echo '$(srcdir)/'`info-stnd.texi; \ + then \ + rm -rf $@; \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + else \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + exit 1; \ + fi $(srcdir)/version-stnd.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-1 $(srcdir)/stamp-1: info-stnd.texi $(top_srcdir)/configure @(dir=.; test -f ./info-stnd.texi || dir=$(srcdir); \ @@ -376,14 +392,10 @@ maintainer-clean-1: @MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-1 $(srcdir)/version-stnd.texi info.info: info.texi $(info_TEXINFOS) - restore=: && \ - backupdir="$(am__leading_dot)am$$$$" && \ + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ rm -rf $$backupdir && mkdir $$backupdir && \ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then \ - mv $$f $$backupdir; \ - restore=mv; \ - fi; \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ done; \ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $@ `test -f 'info.texi' || echo '$(srcdir)/'`info.texi; \ @@ -393,8 +405,7 @@ info.info: info.texi $(info_TEXINFOS) rc=$$?; \ $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ fi; \ - rm -rf $$backupdir; \ - exit $$rc + rm -rf $$backupdir; exit $$rc info.dvi: info.texi $(info_TEXINFOS) TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ @@ -407,10 +418,18 @@ info.pdf: info.texi $(info_TEXINFOS) $(TEXI2PDF) -o $@ `test -f 'info.texi' || echo '$(srcdir)/'`info.texi info.html: info.texi $(info_TEXINFOS) - $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ `test -f 'info.texi' || echo '$(srcdir)/'`info.texi - if test ! -d $@ && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else :; fi + rm -rf $(@:.html=.htp) + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $(@:.html=.htp) `test -f 'info.texi' || echo '$(srcdir)/'`info.texi; \ + then \ + rm -rf $@; \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + else \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + exit 1; \ + fi .dvi.ps: $(DVIPS) -o $@ $< @@ -608,12 +627,13 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@INSTALL_WARNINGS_FALSE@install-data-local: clean: clean-am clean-am: clean-generic mostlyclean-am @@ -710,18 +730,20 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 -install-data-local: - @echo - @echo "WARNING: You must install texinfo.tex and txi-??.tex manually," - @echo " perhaps in TEXMF/tex/texinfo/," - @echo " where TEXMF is a root of your TeX tree." - @echo " See doc/README for some considerations." - @echo " You can run make TEXMF=/your/texmf install-tex to do this." - @echo - @echo " You may also need to install epsf.tex and (if you" - @echo " use pdftex) pdfcolor.tex in TEXMF/tex/generic/dvips" - @echo " and TEXMF/pdftex/plain/misc/pdfcolor.tex respectively," - @echo " if your TeX installation did not include them." +@INSTALL_WARNINGS_TRUE@install-data-local: +@INSTALL_WARNINGS_TRUE@ @echo +@INSTALL_WARNINGS_TRUE@ @echo "WARNING: If your texmf tree does not already contain" +@INSTALL_WARNINGS_TRUE@ @echo " up-to-date versions, you must install" +@INSTALL_WARNINGS_TRUE@ @echo " texinfo.tex and txi-??.tex manually," +@INSTALL_WARNINGS_TRUE@ @echo " perhaps in TEXMF/tex/texinfo/," +@INSTALL_WARNINGS_TRUE@ @echo " where TEXMF is a root of your TeX tree." +@INSTALL_WARNINGS_TRUE@ @echo " See doc/README for some considerations." +@INSTALL_WARNINGS_TRUE@ @echo " You can run make TEXMF=/your/texmf install-tex to do this." +@INSTALL_WARNINGS_TRUE@ @echo +@INSTALL_WARNINGS_TRUE@ @echo " You may also need to install epsf.tex and (if you" +@INSTALL_WARNINGS_TRUE@ @echo " use pdftex) pdfcolor.tex in TEXMF/tex/generic/dvips" +@INSTALL_WARNINGS_TRUE@ @echo " and TEXMF/pdftex/plain/misc/pdfcolor.tex respectively," +@INSTALL_WARNINGS_TRUE@ @echo " if your TeX installation did not include them." install-tex: test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1) $(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips) $(DESTDIR)$(texmf_pdftex_misc) @@ -731,17 +753,17 @@ install-tex: for f in $(TXI_XLATE); do \ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done @MAINTAINER_MODE_TRUE@info.1: $(top_srcdir)/info/info.c $(common_mandeps) -@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="read Info documents" `basename $< .c` >$@ +@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="read Info documents" `basename $@ .1` >$@ @MAINTAINER_MODE_TRUE@infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps) -@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="compile customizations for Info" `basename $< .c` >$@ +@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="compile customizations for Info" `basename $@ .1` >$@ @MAINTAINER_MODE_TRUE@install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps) -@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="update info/dir entries" `basename $< .c` >$@ +@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="update info/dir entries" `basename $@ .1` >$@ @MAINTAINER_MODE_TRUE@makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps) -@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="translate Texinfo documents" `basename $< .c` >$@ +@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="translate Texinfo documents" `basename $@ .1` >$@ @MAINTAINER_MODE_TRUE@texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps) -@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="print Texinfo documents" `basename $< .c` >$@ +@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="print Texinfo documents" `basename $@ .1` >$@ @MAINTAINER_MODE_TRUE@texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps) -@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="sort Texinfo index files" `basename $< .c` >$@ +@MAINTAINER_MODE_TRUE@ $(HELP2MAN) --name="sort Texinfo index files" `basename $@ .1` >$@ # Do not create info files for distribution. dist-info: diff --git a/gnu/dist/texinfo/doc/texindex.1 b/gnu/dist/texinfo/doc/texindex.1 index 1f32f94af67..63dfcebd88c 100644 --- a/gnu/dist/texinfo/doc/texindex.1 +++ b/gnu/dist/texinfo/doc/texindex.1 @@ -1,7 +1,7 @@ -.\" $NetBSD: texindex.1,v 1.2 2006/12/01 18:21:04 drochner Exp $ +.\" $NetBSD: texindex.1,v 1.3 2008/09/02 08:00:24 christos Exp $ .\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH TEXINDEX "1" "April 2004" "texindex 4.7" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34. +.TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands" .SH NAME texindex \- sort Texinfo index files .SH SYNOPSIS @@ -21,8 +21,8 @@ send output to FILE \fB\-\-version\fR display version information and exit .SH "REPORTING BUGS" -Email bug reports to bug-texinfo@gnu.org, -general questions and discussion to help-texinfo@gnu.org. +Email bug reports to bug\-texinfo@gnu.org, +general questions and discussion to help\-texinfo@gnu.org. Texinfo home page: http://www.gnu.org/software/texinfo/ .SH COPYRIGHT Copyright \(co 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/Makefile.in b/gnu/dist/texinfo/info/Makefile.in index efd58f9940c..60dab7b3729 100644 --- a/gnu/dist/texinfo/info/Makefile.in +++ b/gnu/dist/texinfo/info/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Id: Makefile.am,v 1.2 2004/01/09 09:07:44 dirt Exp +# Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp # Makefile.am for texinfo/info. # Run automake in .. to produce Makefile.in from this. # @@ -26,7 +26,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -SOURCES = $(ginfo_SOURCES) $(infokey_SOURCES) $(makedoc_SOURCES) +SOURCES = $(ginfo_SOURCES) $(nodist_ginfo_SOURCES) $(infokey_SOURCES) $(nodist_infokey_SOURCES) $(makedoc_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -47,9 +47,10 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = makedoc$(EXEEXT) bin_PROGRAMS = ginfo$(EXEEXT) infokey$(EXEEXT) +noinst_PROGRAMS = makedoc$(EXEEXT) subdir = info DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -77,7 +78,6 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am__objects_1 = doc.$(OBJEXT) key.$(OBJEXT) am_ginfo_OBJECTS = dir.$(OBJEXT) display.$(OBJEXT) dribble.$(OBJEXT) \ echo-area.$(OBJEXT) filesys.$(OBJEXT) footnotes.$(OBJEXT) \ gc.$(OBJEXT) indices.$(OBJEXT) info-utils.$(OBJEXT) \ @@ -85,14 +85,16 @@ am_ginfo_OBJECTS = dir.$(OBJEXT) display.$(OBJEXT) dribble.$(OBJEXT) \ m-x.$(OBJEXT) man.$(OBJEXT) nodemenu.$(OBJEXT) nodes.$(OBJEXT) \ search.$(OBJEXT) session.$(OBJEXT) signals.$(OBJEXT) \ terminal.$(OBJEXT) tilde.$(OBJEXT) variables.$(OBJEXT) \ - window.$(OBJEXT) $(am__objects_1) -ginfo_OBJECTS = $(am_ginfo_OBJECTS) + window.$(OBJEXT) +nodist_ginfo_OBJECTS = doc.$(OBJEXT) +ginfo_OBJECTS = $(am_ginfo_OBJECTS) $(nodist_ginfo_OBJECTS) ginfo_LDADD = $(LDADD) am__DEPENDENCIES_1 = ginfo_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_infokey_OBJECTS = infokey.$(OBJEXT) key.$(OBJEXT) -infokey_OBJECTS = $(am_infokey_OBJECTS) +am_infokey_OBJECTS = infokey.$(OBJEXT) +nodist_infokey_OBJECTS = key.$(OBJEXT) +infokey_OBJECTS = $(am_infokey_OBJECTS) $(nodist_infokey_OBJECTS) infokey_LDADD = $(LDADD) infokey_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -104,25 +106,12 @@ makedoc_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) \ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dir.Po ./$(DEPDIR)/display.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/doc.Po ./$(DEPDIR)/dribble.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/echo-area.Po ./$(DEPDIR)/filesys.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/footnotes.Po ./$(DEPDIR)/gc.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/indices.Po ./$(DEPDIR)/info-utils.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/info.Po ./$(DEPDIR)/infodoc.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/infokey.Po ./$(DEPDIR)/infomap.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/key.Po ./$(DEPDIR)/m-x.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/makedoc.Po ./$(DEPDIR)/man.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/nodemenu.Po ./$(DEPDIR)/nodes.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/search.Po ./$(DEPDIR)/session.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/signals.Po ./$(DEPDIR)/terminal.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tilde.Po ./$(DEPDIR)/variables.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/window.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(ginfo_SOURCES) $(infokey_SOURCES) $(makedoc_SOURCES) +SOURCES = $(ginfo_SOURCES) $(nodist_ginfo_SOURCES) $(infokey_SOURCES) \ + $(nodist_infokey_SOURCES) $(makedoc_SOURCES) DIST_SOURCES = $(ginfo_SOURCES) $(infokey_SOURCES) $(makedoc_SOURCES) ETAGS = etags CTAGS = ctags @@ -148,7 +137,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \ -DINFODIR2=\"$(infodir2)\" - DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -167,6 +155,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -201,6 +191,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -213,6 +205,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -234,6 +228,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -249,14 +244,7 @@ infodir2 = $(datadir)/info # we need to override it, so include them ourselves. INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir) LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL) - -# The files `doc.c' and `funs.h' are created by ./makedoc run over the source -# 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. -BUILT_SOURCES = doc.c funs.h key.c -EXTRA_DIST = README pcterm.c $(BUILT_SOURCES) -makedoc_SOURCES = makedoc.c +EXTRA_DIST = README pcterm.c ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \ echo-area.c echo-area.h \ filesys.c filesys.h footnotes.c footnotes.h gc.c gc.h \ @@ -264,16 +252,32 @@ ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \ infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c nodes.h \ search.c search.h session.c session.h signals.c signals.h \ termdep.h terminal.c terminal.h tilde.c tilde.h \ - variables.c variables.h window.c window.h \ - $(BUILT_SOURCES) $(generated_sources) + variables.c variables.h window.c window.h + +nodist_ginfo_SOURCES = doc.c funs.h +infokey_SOURCES = infokey.c infokey.h key.h +nodist_infokey_SOURCES = key.c funs.h -infokey_SOURCES = infokey.c infokey.h key.c key.h +# The files `doc.c', `key.c' and `funs.h' are created by ./makedoc run over the +# source 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. +# +generated_sources = doc.c key.c funs.h + +# These files are not distributed. +DISTCLEANFILES = $(generated_sources) +makedoc_SOURCES = makedoc.c # Files with Info commands defined that makedoc should read. 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 + +# The following hack is necessary to hint make before the automatic +# dependencies are built. +BUILT_SOURCES = funs.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -382,16 +386,14 @@ distclean-compile: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -415,9 +417,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -496,7 +500,8 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -565,10 +570,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-info-am +# We need a linear ordering to prevent race condition in parallel make. +# See the node ``(automake)Multiple Outputs'' for an explanation. +doc.c: key.c +key.c: funs.h + # The $(EXEEXT) should be added by Automake, but isn't. Fine. -$(BUILT_SOURCES): makedoc$(EXEEXT) $(cmd_sources) - rm -f $(BUILT_SOURCES) - ./makedoc $(cmd_sources) +$(generated_sources): makedoc$(EXEEXT) $(cmd_sources) + rm -f $(generated_sources) + $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gnu/dist/texinfo/info/doc.c b/gnu/dist/texinfo/info/doc.c deleted file mode 100644 index eeec47907b6..00000000000 --- a/gnu/dist/texinfo/info/doc.c +++ /dev/null @@ -1,148 +0,0 @@ -/* $NetBSD: doc.c,v 1.1.1.4 2004/07/12 23:26:52 wiz Exp $ */ - -/* doc.c -- Generated structure containing function names and doc strings. - - This file was automatically made from various source files with the - command `./makedoc'. DO NOT EDIT THIS FILE, only `./makedoc.c'. - Source files groveled to make this file include: - - ./session.c - ./echo-area.c - ./infodoc.c - ./m-x.c - ./indices.c - ./nodemenu.c - ./footnotes.c - ./variables.c - - An entry in the array FUNCTION_DOC_ARRAY is made for each command - found in the above files; each entry consists of a function pointer, - a string which is the user-visible name of the function, - and a string which documents its purpose. */ - -#include "info.h" -#include "funs.h" - -FUNCTION_DOC function_doc_array[] = { - -/* Commands found in "./session.c". */ - { (VFunction *)info_next_line, "next-line", (FUNCTION_KEYSEQ *)0, "Move down to the next line" }, - { (VFunction *)info_prev_line, "prev-line", (FUNCTION_KEYSEQ *)0, "Move up to the previous line" }, - { (VFunction *)info_end_of_line, "end-of-line", (FUNCTION_KEYSEQ *)0, "Move to the end of the line" }, - { (VFunction *)info_beginning_of_line, "beginning-of-line", (FUNCTION_KEYSEQ *)0, "Move to the start of the line" }, - { (VFunction *)info_forward_char, "forward-char", (FUNCTION_KEYSEQ *)0, "Move forward a character" }, - { (VFunction *)info_backward_char, "backward-char", (FUNCTION_KEYSEQ *)0, "Move backward a character" }, - { (VFunction *)info_forward_word, "forward-word", (FUNCTION_KEYSEQ *)0, "Move forward a word" }, - { (VFunction *)info_backward_word, "backward-word", (FUNCTION_KEYSEQ *)0, "Move backward a word" }, - { (VFunction *)info_global_next_node, "global-next-node", (FUNCTION_KEYSEQ *)0, "Move forwards or down through node structure" }, - { (VFunction *)info_global_prev_node, "global-prev-node", (FUNCTION_KEYSEQ *)0, "Move backwards or up through node structure" }, - { (VFunction *)info_scroll_forward, "scroll-forward", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window" }, - { (VFunction *)info_scroll_forward_set_window, "scroll-forward-set-window", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window and set default window size" }, - { (VFunction *)info_scroll_forward_page_only, "scroll-forward-page-only", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window staying within node" }, - { (VFunction *)info_scroll_forward_page_only_set_window, "scroll-forward-page-only-set-window", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window staying within node and set default window size" }, - { (VFunction *)info_scroll_backward, "scroll-backward", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window" }, - { (VFunction *)info_scroll_backward_set_window, "scroll-backward-set-window", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window and set default window size" }, - { (VFunction *)info_scroll_backward_page_only, "scroll-backward-page-only", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window staying within node" }, - { (VFunction *)info_scroll_backward_page_only_set_window, "scroll-backward-page-only-set-window", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window staying within node and set default window size" }, - { (VFunction *)info_beginning_of_node, "beginning-of-node", (FUNCTION_KEYSEQ *)0, "Move to the start of this node" }, - { (VFunction *)info_end_of_node, "end-of-node", (FUNCTION_KEYSEQ *)0, "Move to the end of this node" }, - { (VFunction *)info_down_line, "down-line", (FUNCTION_KEYSEQ *)0, "Scroll down by lines" }, - { (VFunction *)info_up_line, "up-line", (FUNCTION_KEYSEQ *)0, "Scroll up by lines" }, - { (VFunction *)info_scroll_half_screen_down, "scroll-half-screen-down", (FUNCTION_KEYSEQ *)0, "Scroll down by half screen size" }, - { (VFunction *)info_scroll_half_screen_up, "scroll-half-screen-up", (FUNCTION_KEYSEQ *)0, "Scroll up by half screen size" }, - { (VFunction *)info_next_window, "next-window", (FUNCTION_KEYSEQ *)0, "Select the next window" }, - { (VFunction *)info_prev_window, "prev-window", (FUNCTION_KEYSEQ *)0, "Select the previous window" }, - { (VFunction *)info_split_window, "split-window", (FUNCTION_KEYSEQ *)0, "Split the current window" }, - { (VFunction *)info_delete_window, "delete-window", (FUNCTION_KEYSEQ *)0, "Delete the current window" }, - { (VFunction *)info_keep_one_window, "keep-one-window", (FUNCTION_KEYSEQ *)0, "Delete all other windows" }, - { (VFunction *)info_scroll_other_window, "scroll-other-window", (FUNCTION_KEYSEQ *)0, "Scroll the other window" }, - { (VFunction *)info_scroll_other_window_backward, "scroll-other-window-backward", (FUNCTION_KEYSEQ *)0, "Scroll the other window backward" }, - { (VFunction *)info_grow_window, "grow-window", (FUNCTION_KEYSEQ *)0, "Grow (or shrink) this window" }, - { (VFunction *)info_tile_windows, "tile-windows", (FUNCTION_KEYSEQ *)0, "Divide the available screen space among the visible windows" }, - { (VFunction *)info_toggle_wrap, "toggle-wrap", (FUNCTION_KEYSEQ *)0, "Toggle the state of line wrapping in the current window" }, - { (VFunction *)info_next_node, "next-node", (FUNCTION_KEYSEQ *)0, "Select the Next node" }, - { (VFunction *)info_prev_node, "prev-node", (FUNCTION_KEYSEQ *)0, "Select the Prev node" }, - { (VFunction *)info_up_node, "up-node", (FUNCTION_KEYSEQ *)0, "Select the Up node" }, - { (VFunction *)info_last_node, "last-node", (FUNCTION_KEYSEQ *)0, "Select the last node in this file" }, - { (VFunction *)info_first_node, "first-node", (FUNCTION_KEYSEQ *)0, "Select the first node in this file" }, - { (VFunction *)info_last_menu_item, "last-menu-item", (FUNCTION_KEYSEQ *)0, "Select the last item in this node's menu" }, - { (VFunction *)info_menu_digit, "menu-digit", (FUNCTION_KEYSEQ *)0, "Select this menu item" }, - { (VFunction *)info_menu_item, "menu-item", (FUNCTION_KEYSEQ *)0, "Read a menu item and select its node" }, - { (VFunction *)info_xref_item, "xref-item", (FUNCTION_KEYSEQ *)0, "Read a footnote or cross reference and select its node" }, - { (VFunction *)info_find_menu, "find-menu", (FUNCTION_KEYSEQ *)0, "Move to the start of this node's menu" }, - { (VFunction *)info_visit_menu, "visit-menu", (FUNCTION_KEYSEQ *)0, "Visit as many menu items at once as possible" }, - { (VFunction *)info_goto_node, "goto-node", (FUNCTION_KEYSEQ *)0, "Read a node name and select it" }, - { (VFunction *)info_menu_sequence, "menu-sequence", (FUNCTION_KEYSEQ *)0, "Read a list of menus starting from dir and follow them" }, - { (VFunction *)info_goto_invocation_node, "goto-invocation-node", (FUNCTION_KEYSEQ *)0, "Find the node describing program invocation" }, - { (VFunction *)info_man, "man", (FUNCTION_KEYSEQ *)0, "Read a manpage reference and select it" }, - { (VFunction *)info_top_node, "top-node", (FUNCTION_KEYSEQ *)0, "Select the node `Top' in this file" }, - { (VFunction *)info_dir_node, "dir-node", (FUNCTION_KEYSEQ *)0, "Select the node `(dir)'" }, - { (VFunction *)info_history_node, "history-node", (FUNCTION_KEYSEQ *)0, "Select the most recently selected node" }, - { (VFunction *)info_kill_node, "kill-node", (FUNCTION_KEYSEQ *)0, "Kill this node" }, - { (VFunction *)info_view_file, "view-file", (FUNCTION_KEYSEQ *)0, "Read the name of a file and select it" }, - { (VFunction *)info_print_node, "print-node", (FUNCTION_KEYSEQ *)0, "Pipe the contents of this node through INFO_PRINT_COMMAND" }, - { (VFunction *)info_search_case_sensitively, "search-case-sensitively", (FUNCTION_KEYSEQ *)0, "Read a string and search for it case-sensitively" }, - { (VFunction *)info_search, "search", (FUNCTION_KEYSEQ *)0, "Read a string and search for it" }, - { (VFunction *)info_search_backward, "search-backward", (FUNCTION_KEYSEQ *)0, "Read a string and search backward for it" }, - { (VFunction *)info_search_next, "search-next", (FUNCTION_KEYSEQ *)0, "Repeat last search in the same direction" }, - { (VFunction *)info_search_previous, "search-previous", (FUNCTION_KEYSEQ *)0, "Repeat last search in the reverse direction" }, - { (VFunction *)isearch_forward, "isearch-forward", (FUNCTION_KEYSEQ *)0, "Search interactively for a string as you type it" }, - { (VFunction *)isearch_backward, "isearch-backward", (FUNCTION_KEYSEQ *)0, "Search interactively for a string as you type it" }, - { (VFunction *)info_move_to_prev_xref, "move-to-prev-xref", (FUNCTION_KEYSEQ *)0, "Move to the previous cross reference" }, - { (VFunction *)info_move_to_next_xref, "move-to-next-xref", (FUNCTION_KEYSEQ *)0, "Move to the next cross reference" }, - { (VFunction *)info_select_reference_this_line, "select-reference-this-line", (FUNCTION_KEYSEQ *)0, "Select reference or menu item appearing on this line" }, - { (VFunction *)info_abort_key, "abort-key", (FUNCTION_KEYSEQ *)0, "Cancel current operation" }, - { (VFunction *)info_move_to_window_line, "move-to-window-line", (FUNCTION_KEYSEQ *)0, "Move the cursor to a specific line of the window" }, - { (VFunction *)info_redraw_display, "redraw-display", (FUNCTION_KEYSEQ *)0, "Redraw the display" }, - { (VFunction *)info_quit, "quit", (FUNCTION_KEYSEQ *)0, "Quit using Info" }, - { (VFunction *)info_do_lowercase_version, "do-lowercase-version", (FUNCTION_KEYSEQ *)0, "Run command bound to this key's lowercase variant" }, - { (VFunction *)info_add_digit_to_numeric_arg, "add-digit-to-numeric-arg", (FUNCTION_KEYSEQ *)0, "Add this digit to the current numeric argument" }, - { (VFunction *)info_universal_argument, "universal-argument", (FUNCTION_KEYSEQ *)0, "Start (or multiply by 4) the current numeric argument" }, - { (VFunction *)info_numeric_arg_digit_loop, "numeric-arg-digit-loop", (FUNCTION_KEYSEQ *)0, "Internally used by \\[universal-argument]" }, -/* Commands found in "./echo-area.c". */ - { (VFunction *)ea_forward, "echo-area-forward", (FUNCTION_KEYSEQ *)0, "Move forward a character" }, - { (VFunction *)ea_backward, "echo-area-backward", (FUNCTION_KEYSEQ *)0, "Move backward a character" }, - { (VFunction *)ea_beg_of_line, "echo-area-beg-of-line", (FUNCTION_KEYSEQ *)0, "Move to the start of this line" }, - { (VFunction *)ea_end_of_line, "echo-area-end-of-line", (FUNCTION_KEYSEQ *)0, "Move to the end of this line" }, - { (VFunction *)ea_forward_word, "echo-area-forward-word", (FUNCTION_KEYSEQ *)0, "Move forward a word" }, - { (VFunction *)ea_backward_word, "echo-area-backward-word", (FUNCTION_KEYSEQ *)0, "Move backward a word" }, - { (VFunction *)ea_delete, "echo-area-delete", (FUNCTION_KEYSEQ *)0, "Delete the character under the cursor" }, - { (VFunction *)ea_rubout, "echo-area-rubout", (FUNCTION_KEYSEQ *)0, "Delete the character behind the cursor" }, - { (VFunction *)ea_abort, "echo-area-abort", (FUNCTION_KEYSEQ *)0, "Cancel or quit operation" }, - { (VFunction *)ea_newline, "echo-area-newline", (FUNCTION_KEYSEQ *)0, "Accept (or force completion of) this line" }, - { (VFunction *)ea_quoted_insert, "echo-area-quoted-insert", (FUNCTION_KEYSEQ *)0, "Insert next character verbatim" }, - { (VFunction *)ea_insert, "echo-area-insert", (FUNCTION_KEYSEQ *)0, "Insert this character" }, - { (VFunction *)ea_tab_insert, "echo-area-tab-insert", (FUNCTION_KEYSEQ *)0, "Insert a TAB character" }, - { (VFunction *)ea_transpose_chars, "echo-area-transpose-chars", (FUNCTION_KEYSEQ *)0, "Transpose characters at point" }, - { (VFunction *)ea_yank, "echo-area-yank", (FUNCTION_KEYSEQ *)0, "Yank back the contents of the last kill" }, - { (VFunction *)ea_yank_pop, "echo-area-yank-pop", (FUNCTION_KEYSEQ *)0, "Yank back a previous kill" }, - { (VFunction *)ea_kill_line, "echo-area-kill-line", (FUNCTION_KEYSEQ *)0, "Kill to the end of the line" }, - { (VFunction *)ea_backward_kill_line, "echo-area-backward-kill-line", (FUNCTION_KEYSEQ *)0, "Kill to the beginning of the line" }, - { (VFunction *)ea_kill_word, "echo-area-kill-word", (FUNCTION_KEYSEQ *)0, "Kill the word following the cursor" }, - { (VFunction *)ea_backward_kill_word, "echo-area-backward-kill-word", (FUNCTION_KEYSEQ *)0, "Kill the word preceding the cursor" }, - { (VFunction *)ea_possible_completions, "echo-area-possible-completions", (FUNCTION_KEYSEQ *)0, "List possible completions" }, - { (VFunction *)ea_complete, "echo-area-complete", (FUNCTION_KEYSEQ *)0, "Insert completion" }, - { (VFunction *)ea_scroll_completions_window, "echo-area-scroll-completions-window", (FUNCTION_KEYSEQ *)0, "Scroll the completions window" }, -/* Commands found in "./infodoc.c". */ - { (VFunction *)info_get_help_window, "get-help-window", (FUNCTION_KEYSEQ *)0, "Display help message" }, - { (VFunction *)info_get_info_help_node, "get-info-help-node", (FUNCTION_KEYSEQ *)0, "Visit Info node `(info)Help'" }, - { (VFunction *)describe_key, "describe-key", (FUNCTION_KEYSEQ *)0, "Print documentation for KEY" }, - { (VFunction *)info_where_is, "where-is", (FUNCTION_KEYSEQ *)0, "Show what to type to execute a given command" }, -/* Commands found in "./m-x.c". */ - { (VFunction *)describe_command, "describe-command", (FUNCTION_KEYSEQ *)0, "Read the name of an Info command and describe it" }, - { (VFunction *)info_execute_command, "execute-command", (FUNCTION_KEYSEQ *)0, "Read a command name in the echo area and execute it" }, - { (VFunction *)set_screen_height, "set-screen-height", (FUNCTION_KEYSEQ *)0, "Set the height of the displayed window" }, -/* Commands found in "./indices.c". */ - { (VFunction *)info_index_search, "index-search", (FUNCTION_KEYSEQ *)0, "Look up a string in the index for this file" }, - { (VFunction *)info_next_index_match, "next-index-match", (FUNCTION_KEYSEQ *)0, "Go to the next matching index item from the last `\\[index-search]' command" }, - { (VFunction *)info_index_apropos, "index-apropos", (FUNCTION_KEYSEQ *)0, "Grovel all known info file's indices for a string and build a menu" }, -/* Commands found in "./nodemenu.c". */ - { (VFunction *)list_visited_nodes, "list-visited-nodes", (FUNCTION_KEYSEQ *)0, "Make a window containing a menu of all of the currently visited nodes" }, - { (VFunction *)select_visited_node, "select-visited-node", (FUNCTION_KEYSEQ *)0, "Select a node which has been previously visited in a visible window" }, -/* Commands found in "./footnotes.c". */ - { (VFunction *)info_show_footnotes, "show-footnotes", (FUNCTION_KEYSEQ *)0, "Show the footnotes associated with this node in another window" }, -/* Commands found in "./variables.c". */ - { (VFunction *)describe_variable, "describe-variable", (FUNCTION_KEYSEQ *)0, "Explain the use of a variable" }, - { (VFunction *)set_variable, "set-variable", (FUNCTION_KEYSEQ *)0, "Set the value of an Info variable" }, - { (VFunction *)NULL, (char *)NULL, (FUNCTION_KEYSEQ *)NULL, (char *)NULL } -}; diff --git a/gnu/dist/texinfo/info/echo-area.c b/gnu/dist/texinfo/info/echo-area.c index 2c787e10b49..eaa0a0c0c2a 100644 --- a/gnu/dist/texinfo/info/echo-area.c +++ b/gnu/dist/texinfo/info/echo-area.c @@ -1,7 +1,7 @@ -/* $NetBSD: echo-area.c,v 1.2 2004/07/13 18:30:49 he Exp $ */ +/* $NetBSD: echo-area.c,v 1.3 2008/09/02 08:00:24 christos Exp $ */ /* echo-area.c -- how to read a line in the echo area. - Id: echo-area.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: echo-area.c,v 1.7 2004/12/14 00:15:36 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software Foundation, Inc. @@ -938,7 +938,12 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions")) printf_to_message_buffer (completions_found_index == 1 ? (char *) _("One completion:\n") : (char *) _("%d completions:\n"), +<<<<<<< echo-area.c (void*)((intptr_t)completions_found_index), NULL, NULL); +======= + (void *) (long) completions_found_index, + NULL, NULL); +>>>>>>> 1.1.1.5 /* Find the maximum length of a label. */ for (i = 0; i < completions_found_index; i++) @@ -1501,13 +1506,14 @@ pause_or_input (void) for input or a couple of seconds, whichever comes first. Then flush the informational message that was printed. */ void -inform_in_echo_area (char *message) +inform_in_echo_area (const char *message) { - register int i; + int i; char *text; + int avail = EA_MAX_INPUT + 1 - input_line_end; text = xstrdup (message); - for (i = 0; text[i] && text[i] != '\n'; i++) + for (i = 0; text[i] && text[i] != '\n' && i < avail; i++) ; text[i] = 0; diff --git a/gnu/dist/texinfo/info/funs.h b/gnu/dist/texinfo/info/funs.h deleted file mode 100644 index 00b03eb81dc..00000000000 --- a/gnu/dist/texinfo/info/funs.h +++ /dev/null @@ -1,245 +0,0 @@ -/* $NetBSD: funs.h,v 1.1.1.4 2004/07/12 23:26:52 wiz Exp $ */ - -/* funs.h -- Generated declarations for Info commands. */ - -#include "info.h" - -/* Functions declared in "./session.c". */ -#define A_info_next_line 0 -extern void info_next_line (WINDOW *window, int count, unsigned char key); -#define A_info_prev_line 1 -extern void info_prev_line (WINDOW *window, int count, unsigned char key); -#define A_info_end_of_line 2 -extern void info_end_of_line (WINDOW *window, int count, unsigned char key); -#define A_info_beginning_of_line 3 -extern void info_beginning_of_line (WINDOW *window, int count, unsigned char key); -#define A_info_forward_char 4 -extern void info_forward_char (WINDOW *window, int count, unsigned char key); -#define A_info_backward_char 5 -extern void info_backward_char (WINDOW *window, int count, unsigned char key); -#define A_info_forward_word 6 -extern void info_forward_word (WINDOW *window, int count, unsigned char key); -#define A_info_backward_word 7 -extern void info_backward_word (WINDOW *window, int count, unsigned char key); -#define A_info_global_next_node 8 -extern void info_global_next_node (WINDOW *window, int count, unsigned char key); -#define A_info_global_prev_node 9 -extern void info_global_prev_node (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_forward 10 -extern void info_scroll_forward (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_forward_set_window 11 -extern void info_scroll_forward_set_window (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_forward_page_only 12 -extern void info_scroll_forward_page_only (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_forward_page_only_set_window 13 -extern void info_scroll_forward_page_only_set_window (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_backward 14 -extern void info_scroll_backward (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_backward_set_window 15 -extern void info_scroll_backward_set_window (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_backward_page_only 16 -extern void info_scroll_backward_page_only (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_backward_page_only_set_window 17 -extern void info_scroll_backward_page_only_set_window (WINDOW *window, int count, unsigned char key); -#define A_info_beginning_of_node 18 -extern void info_beginning_of_node (WINDOW *window, int count, unsigned char key); -#define A_info_end_of_node 19 -extern void info_end_of_node (WINDOW *window, int count, unsigned char key); -#define A_info_down_line 20 -extern void info_down_line (WINDOW *window, int count, unsigned char key); -#define A_info_up_line 21 -extern void info_up_line (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_half_screen_down 22 -extern void info_scroll_half_screen_down (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_half_screen_up 23 -extern void info_scroll_half_screen_up (WINDOW *window, int count, unsigned char key); -#define A_info_next_window 24 -extern void info_next_window (WINDOW *window, int count, unsigned char key); -#define A_info_prev_window 25 -extern void info_prev_window (WINDOW *window, int count, unsigned char key); -#define A_info_split_window 26 -extern void info_split_window (WINDOW *window, int count, unsigned char key); -#define A_info_delete_window 27 -extern void info_delete_window (WINDOW *window, int count, unsigned char key); -#define A_info_keep_one_window 28 -extern void info_keep_one_window (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_other_window 29 -extern void info_scroll_other_window (WINDOW *window, int count, unsigned char key); -#define A_info_scroll_other_window_backward 30 -extern void info_scroll_other_window_backward (WINDOW *window, int count, unsigned char key); -#define A_info_grow_window 31 -extern void info_grow_window (WINDOW *window, int count, unsigned char key); -#define A_info_tile_windows 32 -extern void info_tile_windows (WINDOW *window, int count, unsigned char key); -#define A_info_toggle_wrap 33 -extern void info_toggle_wrap (WINDOW *window, int count, unsigned char key); -#define A_info_next_node 34 -extern void info_next_node (WINDOW *window, int count, unsigned char key); -#define A_info_prev_node 35 -extern void info_prev_node (WINDOW *window, int count, unsigned char key); -#define A_info_up_node 36 -extern void info_up_node (WINDOW *window, int count, unsigned char key); -#define A_info_last_node 37 -extern void info_last_node (WINDOW *window, int count, unsigned char key); -#define A_info_first_node 38 -extern void info_first_node (WINDOW *window, int count, unsigned char key); -#define A_info_last_menu_item 39 -extern void info_last_menu_item (WINDOW *window, int count, unsigned char key); -#define A_info_menu_digit 40 -extern void info_menu_digit (WINDOW *window, int count, unsigned char key); -#define A_info_menu_item 41 -extern void info_menu_item (WINDOW *window, int count, unsigned char key); -#define A_info_xref_item 42 -extern void info_xref_item (WINDOW *window, int count, unsigned char key); -#define A_info_find_menu 43 -extern void info_find_menu (WINDOW *window, int count, unsigned char key); -#define A_info_visit_menu 44 -extern void info_visit_menu (WINDOW *window, int count, unsigned char key); -#define A_info_goto_node 45 -extern void info_goto_node (WINDOW *window, int count, unsigned char key); -#define A_info_menu_sequence 46 -extern void info_menu_sequence (WINDOW *window, int count, unsigned char key); -#define A_info_goto_invocation_node 47 -extern void info_goto_invocation_node (WINDOW *window, int count, unsigned char key); -#define A_info_man 48 -extern void info_man (WINDOW *window, int count, unsigned char key); -#define A_info_top_node 49 -extern void info_top_node (WINDOW *window, int count, unsigned char key); -#define A_info_dir_node 50 -extern void info_dir_node (WINDOW *window, int count, unsigned char key); -#define A_info_history_node 51 -extern void info_history_node (WINDOW *window, int count, unsigned char key); -#define A_info_kill_node 52 -extern void info_kill_node (WINDOW *window, int count, unsigned char key); -#define A_info_view_file 53 -extern void info_view_file (WINDOW *window, int count, unsigned char key); -#define A_info_print_node 54 -extern void info_print_node (WINDOW *window, int count, unsigned char key); -#define A_info_search_case_sensitively 55 -extern void info_search_case_sensitively (WINDOW *window, int count, unsigned char key); -#define A_info_search 56 -extern void info_search (WINDOW *window, int count, unsigned char key); -#define A_info_search_backward 57 -extern void info_search_backward (WINDOW *window, int count, unsigned char key); -#define A_info_search_next 58 -extern void info_search_next (WINDOW *window, int count, unsigned char key); -#define A_info_search_previous 59 -extern void info_search_previous (WINDOW *window, int count, unsigned char key); -#define A_isearch_forward 60 -extern void isearch_forward (WINDOW *window, int count, unsigned char key); -#define A_isearch_backward 61 -extern void isearch_backward (WINDOW *window, int count, unsigned char key); -#define A_info_move_to_prev_xref 62 -extern void info_move_to_prev_xref (WINDOW *window, int count, unsigned char key); -#define A_info_move_to_next_xref 63 -extern void info_move_to_next_xref (WINDOW *window, int count, unsigned char key); -#define A_info_select_reference_this_line 64 -extern void info_select_reference_this_line (WINDOW *window, int count, unsigned char key); -#define A_info_abort_key 65 -extern void info_abort_key (WINDOW *window, int count, unsigned char key); -#define A_info_move_to_window_line 66 -extern void info_move_to_window_line (WINDOW *window, int count, unsigned char key); -#define A_info_redraw_display 67 -extern void info_redraw_display (WINDOW *window, int count, unsigned char key); -#define A_info_quit 68 -extern void info_quit (WINDOW *window, int count, unsigned char key); -#define A_info_do_lowercase_version 69 -extern void info_do_lowercase_version (WINDOW *window, int count, unsigned char key); -#define A_info_add_digit_to_numeric_arg 70 -extern void info_add_digit_to_numeric_arg (WINDOW *window, int count, unsigned char key); -#define A_info_universal_argument 71 -extern void info_universal_argument (WINDOW *window, int count, unsigned char key); -#define A_info_numeric_arg_digit_loop 72 -extern void info_numeric_arg_digit_loop (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./echo-area.c". */ -#define A_ea_forward 73 -extern void ea_forward (WINDOW *window, int count, unsigned char key); -#define A_ea_backward 74 -extern void ea_backward (WINDOW *window, int count, unsigned char key); -#define A_ea_beg_of_line 75 -extern void ea_beg_of_line (WINDOW *window, int count, unsigned char key); -#define A_ea_end_of_line 76 -extern void ea_end_of_line (WINDOW *window, int count, unsigned char key); -#define A_ea_forward_word 77 -extern void ea_forward_word (WINDOW *window, int count, unsigned char key); -#define A_ea_backward_word 78 -extern void ea_backward_word (WINDOW *window, int count, unsigned char key); -#define A_ea_delete 79 -extern void ea_delete (WINDOW *window, int count, unsigned char key); -#define A_ea_rubout 80 -extern void ea_rubout (WINDOW *window, int count, unsigned char key); -#define A_ea_abort 81 -extern void ea_abort (WINDOW *window, int count, unsigned char key); -#define A_ea_newline 82 -extern void ea_newline (WINDOW *window, int count, unsigned char key); -#define A_ea_quoted_insert 83 -extern void ea_quoted_insert (WINDOW *window, int count, unsigned char key); -#define A_ea_insert 84 -extern void ea_insert (WINDOW *window, int count, unsigned char key); -#define A_ea_tab_insert 85 -extern void ea_tab_insert (WINDOW *window, int count, unsigned char key); -#define A_ea_transpose_chars 86 -extern void ea_transpose_chars (WINDOW *window, int count, unsigned char key); -#define A_ea_yank 87 -extern void ea_yank (WINDOW *window, int count, unsigned char key); -#define A_ea_yank_pop 88 -extern void ea_yank_pop (WINDOW *window, int count, unsigned char key); -#define A_ea_kill_line 89 -extern void ea_kill_line (WINDOW *window, int count, unsigned char key); -#define A_ea_backward_kill_line 90 -extern void ea_backward_kill_line (WINDOW *window, int count, unsigned char key); -#define A_ea_kill_word 91 -extern void ea_kill_word (WINDOW *window, int count, unsigned char key); -#define A_ea_backward_kill_word 92 -extern void ea_backward_kill_word (WINDOW *window, int count, unsigned char key); -#define A_ea_possible_completions 93 -extern void ea_possible_completions (WINDOW *window, int count, unsigned char key); -#define A_ea_complete 94 -extern void ea_complete (WINDOW *window, int count, unsigned char key); -#define A_ea_scroll_completions_window 95 -extern void ea_scroll_completions_window (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./infodoc.c". */ -#define A_info_get_help_window 96 -extern void info_get_help_window (WINDOW *window, int count, unsigned char key); -#define A_info_get_info_help_node 97 -extern void info_get_info_help_node (WINDOW *window, int count, unsigned char key); -#define A_describe_key 98 -extern void describe_key (WINDOW *window, int count, unsigned char key); -#define A_info_where_is 99 -extern void info_where_is (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./m-x.c". */ -#define A_describe_command 100 -extern void describe_command (WINDOW *window, int count, unsigned char key); -#define A_info_execute_command 101 -extern void info_execute_command (WINDOW *window, int count, unsigned char key); -#define A_set_screen_height 102 -extern void set_screen_height (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./indices.c". */ -#define A_info_index_search 103 -extern void info_index_search (WINDOW *window, int count, unsigned char key); -#define A_info_next_index_match 104 -extern void info_next_index_match (WINDOW *window, int count, unsigned char key); -#define A_info_index_apropos 105 -extern void info_index_apropos (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./nodemenu.c". */ -#define A_list_visited_nodes 106 -extern void list_visited_nodes (WINDOW *window, int count, unsigned char key); -#define A_select_visited_node 107 -extern void select_visited_node (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./footnotes.c". */ -#define A_info_show_footnotes 108 -extern void info_show_footnotes (WINDOW *window, int count, unsigned char key); - -/* Functions declared in "./variables.c". */ -#define A_describe_variable 109 -extern void describe_variable (WINDOW *window, int count, unsigned char key); -#define A_set_variable 110 -extern void set_variable (WINDOW *window, int count, unsigned char key); - -#define A_NCOMMANDS 111 diff --git a/gnu/dist/texinfo/info/info.c b/gnu/dist/texinfo/info/info.c index 0b72c473d4c..a916131b4c9 100644 --- a/gnu/dist/texinfo/info/info.c +++ b/gnu/dist/texinfo/info/info.c @@ -1,7 +1,7 @@ -/* $NetBSD: info.c,v 1.10 2004/07/12 23:41:53 wiz Exp $ */ +/* $NetBSD: info.c,v 1.11 2008/09/02 08:00:24 christos Exp $ */ /* info.c -- Display nodes of Info files in multiple windows. - Id: info.c,v 1.7 2004/03/13 15:52:46 dirt Exp + Id: info.c,v 1.11 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/infokey.c b/gnu/dist/texinfo/info/infokey.c index 241a9d4bb2c..c29dc298b4b 100644 --- a/gnu/dist/texinfo/info/infokey.c +++ b/gnu/dist/texinfo/info/infokey.c @@ -1,7 +1,7 @@ -/* $NetBSD: infokey.c,v 1.2 2004/07/13 19:02:44 he Exp $ */ +/* $NetBSD: infokey.c,v 1.3 2008/09/02 08:00:24 christos Exp $ */ /* infokey.c -- compile ~/.infokey to ~/.info. - Id: infokey.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -641,7 +641,11 @@ compile (FILE *fp, const char *filename, struct sect *sections) { syntax_error (filename, lnum, (char *) _("NUL character (^%c) not permitted"), +<<<<<<< infokey.c (void *)((intptr_t)c), NULL, NULL, NULL); +======= + (void *) (long) c, NULL, NULL, NULL); +>>>>>>> 1.1.1.5 error = 1; } seqstate = normal; @@ -665,7 +669,11 @@ compile (FILE *fp, const char *filename, struct sect *sections) if (alen == 0) { syntax_error (filename, lnum, (char *) _("missing action name"), +<<<<<<< infokey.c (void *)((intptr_t)c), NULL, NULL, NULL); +======= + (void *) (long) c, NULL, NULL, NULL); +>>>>>>> 1.1.1.5 error = 1; } else diff --git a/gnu/dist/texinfo/info/key.c b/gnu/dist/texinfo/info/key.c deleted file mode 100644 index fd83d4e6960..00000000000 --- a/gnu/dist/texinfo/info/key.c +++ /dev/null @@ -1,148 +0,0 @@ -/* $NetBSD: key.c,v 1.1.1.2 2004/07/12 23:26:52 wiz Exp $ */ - -/* key.c -- Generated array containing function names. - - This file was automatically made from various source files with the - command "./makedoc". DO NOT EDIT THIS FILE, only "./makedoc.c". - - Source files groveled to make this file include: - - ./session.c - ./echo-area.c - ./infodoc.c - ./m-x.c - ./indices.c - ./nodemenu.c - ./footnotes.c - ./variables.c - - An entry in the array FUNCTION_KEY_ARRAY is made for each command - found in the above files; each entry consists of - a string which is the user-visible name of the function. */ - -#include "key.h" -#include "funs.h" - -FUNCTION_KEY function_key_array[] = { - -/* Commands found in "./session.c". */ - { "next-line", A_info_next_line }, - { "prev-line", A_info_prev_line }, - { "end-of-line", A_info_end_of_line }, - { "beginning-of-line", A_info_beginning_of_line }, - { "forward-char", A_info_forward_char }, - { "backward-char", A_info_backward_char }, - { "forward-word", A_info_forward_word }, - { "backward-word", A_info_backward_word }, - { "global-next-node", A_info_global_next_node }, - { "global-prev-node", A_info_global_prev_node }, - { "scroll-forward", A_info_scroll_forward }, - { "scroll-forward-set-window", A_info_scroll_forward_set_window }, - { "scroll-forward-page-only", A_info_scroll_forward_page_only }, - { "scroll-forward-page-only-set-window", A_info_scroll_forward_page_only_set_window }, - { "scroll-backward", A_info_scroll_backward }, - { "scroll-backward-set-window", A_info_scroll_backward_set_window }, - { "scroll-backward-page-only", A_info_scroll_backward_page_only }, - { "scroll-backward-page-only-set-window", A_info_scroll_backward_page_only_set_window }, - { "beginning-of-node", A_info_beginning_of_node }, - { "end-of-node", A_info_end_of_node }, - { "down-line", A_info_down_line }, - { "up-line", A_info_up_line }, - { "scroll-half-screen-down", A_info_scroll_half_screen_down }, - { "scroll-half-screen-up", A_info_scroll_half_screen_up }, - { "next-window", A_info_next_window }, - { "prev-window", A_info_prev_window }, - { "split-window", A_info_split_window }, - { "delete-window", A_info_delete_window }, - { "keep-one-window", A_info_keep_one_window }, - { "scroll-other-window", A_info_scroll_other_window }, - { "scroll-other-window-backward", A_info_scroll_other_window_backward }, - { "grow-window", A_info_grow_window }, - { "tile-windows", A_info_tile_windows }, - { "toggle-wrap", A_info_toggle_wrap }, - { "next-node", A_info_next_node }, - { "prev-node", A_info_prev_node }, - { "up-node", A_info_up_node }, - { "last-node", A_info_last_node }, - { "first-node", A_info_first_node }, - { "last-menu-item", A_info_last_menu_item }, - { "menu-digit", A_info_menu_digit }, - { "menu-item", A_info_menu_item }, - { "xref-item", A_info_xref_item }, - { "find-menu", A_info_find_menu }, - { "visit-menu", A_info_visit_menu }, - { "goto-node", A_info_goto_node }, - { "menu-sequence", A_info_menu_sequence }, - { "goto-invocation-node", A_info_goto_invocation_node }, - { "man", A_info_man }, - { "top-node", A_info_top_node }, - { "dir-node", A_info_dir_node }, - { "history-node", A_info_history_node }, - { "kill-node", A_info_kill_node }, - { "view-file", A_info_view_file }, - { "print-node", A_info_print_node }, - { "search-case-sensitively", A_info_search_case_sensitively }, - { "search", A_info_search }, - { "search-backward", A_info_search_backward }, - { "search-next", A_info_search_next }, - { "search-previous", A_info_search_previous }, - { "isearch-forward", A_isearch_forward }, - { "isearch-backward", A_isearch_backward }, - { "move-to-prev-xref", A_info_move_to_prev_xref }, - { "move-to-next-xref", A_info_move_to_next_xref }, - { "select-reference-this-line", A_info_select_reference_this_line }, - { "abort-key", A_info_abort_key }, - { "move-to-window-line", A_info_move_to_window_line }, - { "redraw-display", A_info_redraw_display }, - { "quit", A_info_quit }, - { "do-lowercase-version", A_info_do_lowercase_version }, - { "add-digit-to-numeric-arg", A_info_add_digit_to_numeric_arg }, - { "universal-argument", A_info_universal_argument }, - { "numeric-arg-digit-loop", A_info_numeric_arg_digit_loop }, -/* Commands found in "./echo-area.c". */ - { "echo-area-forward", A_ea_forward }, - { "echo-area-backward", A_ea_backward }, - { "echo-area-beg-of-line", A_ea_beg_of_line }, - { "echo-area-end-of-line", A_ea_end_of_line }, - { "echo-area-forward-word", A_ea_forward_word }, - { "echo-area-backward-word", A_ea_backward_word }, - { "echo-area-delete", A_ea_delete }, - { "echo-area-rubout", A_ea_rubout }, - { "echo-area-abort", A_ea_abort }, - { "echo-area-newline", A_ea_newline }, - { "echo-area-quoted-insert", A_ea_quoted_insert }, - { "echo-area-insert", A_ea_insert }, - { "echo-area-tab-insert", A_ea_tab_insert }, - { "echo-area-transpose-chars", A_ea_transpose_chars }, - { "echo-area-yank", A_ea_yank }, - { "echo-area-yank-pop", A_ea_yank_pop }, - { "echo-area-kill-line", A_ea_kill_line }, - { "echo-area-backward-kill-line", A_ea_backward_kill_line }, - { "echo-area-kill-word", A_ea_kill_word }, - { "echo-area-backward-kill-word", A_ea_backward_kill_word }, - { "echo-area-possible-completions", A_ea_possible_completions }, - { "echo-area-complete", A_ea_complete }, - { "echo-area-scroll-completions-window", A_ea_scroll_completions_window }, -/* Commands found in "./infodoc.c". */ - { "get-help-window", A_info_get_help_window }, - { "get-info-help-node", A_info_get_info_help_node }, - { "describe-key", A_describe_key }, - { "where-is", A_info_where_is }, -/* Commands found in "./m-x.c". */ - { "describe-command", A_describe_command }, - { "execute-command", A_info_execute_command }, - { "set-screen-height", A_set_screen_height }, -/* Commands found in "./indices.c". */ - { "index-search", A_info_index_search }, - { "next-index-match", A_info_next_index_match }, - { "index-apropos", A_info_index_apropos }, -/* Commands found in "./nodemenu.c". */ - { "list-visited-nodes", A_list_visited_nodes }, - { "select-visited-node", A_select_visited_node }, -/* Commands found in "./footnotes.c". */ - { "show-footnotes", A_info_show_footnotes }, -/* Commands found in "./variables.c". */ - { "describe-variable", A_describe_variable }, - { "set-variable", A_set_variable }, - { (char *)NULL, 0 } -}; diff --git a/gnu/dist/texinfo/info/nodes.c b/gnu/dist/texinfo/info/nodes.c index 4905d603e20..3468d232d74 100644 --- a/gnu/dist/texinfo/info/nodes.c +++ b/gnu/dist/texinfo/info/nodes.c @@ -1,7 +1,7 @@ -/* $NetBSD: nodes.c,v 1.6 2004/07/12 23:41:53 wiz Exp $ */ +/* $NetBSD: nodes.c,v 1.7 2008/09/02 08:00:24 christos Exp $ */ /* nodes.c -- how to get an Info file and node. - Id: nodes.c,v 1.4 2004/04/04 16:08:04 karl Exp + Id: nodes.c,v 1.4 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/session.c b/gnu/dist/texinfo/info/session.c index 4675c7d4d27..690bf17a502 100644 --- a/gnu/dist/texinfo/info/session.c +++ b/gnu/dist/texinfo/info/session.c @@ -1,7 +1,7 @@ -/* $NetBSD: session.c,v 1.3 2006/11/25 10:02:53 jnemeth Exp $ */ +/* $NetBSD: session.c,v 1.4 2008/09/02 08:00:24 christos Exp $ */ /* session.c -- user windowing interface to Info. - Id: session.c,v 1.11 2004/04/06 22:58:25 karl Exp + Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -964,7 +964,11 @@ forward_move_node_structure (WINDOW *window, int behaviour) same as the first menu item found in this node. */ window_message_in_echo_area ((char *) _("Moving Up %d time(s), then Next."), +<<<<<<< session.c (void *)((intptr_t)up_counter), NULL); +======= + (void *) (long) up_counter, NULL); +>>>>>>> 1.1.1.7 info_handle_pointer ("Next", window); return; @@ -1946,7 +1950,7 @@ DECLARE_INFO_COMMAND (info_last_menu_item, DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item")) { register int i, item; - register REFERENCE *entry = NULL, **menu; + register REFERENCE **menu; menu = info_menu_of_node (window->node); @@ -1964,7 +1968,7 @@ DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item")) for (i = 0; (entry = menu[i]) && menu[i + 1]; i++); else { - for (i = 0; (entry = menu[i]); i++) + for (i = 0; menu[i]; i++) if (i == item - 1) break; } @@ -1972,12 +1976,16 @@ DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item")) if (menu[i]) { info_select_reference (window, menu[i]); - if (entry->line_number > 0) - info_next_line (window, entry->line_number - 1, key); + if (menu[i]->line_number > 0) + info_next_line (window, menu[i]->line_number - 1, key); } else info_error ((char *) _("There aren't %d items in this menu."), +<<<<<<< session.c (void *)((intptr_t)item), NULL); +======= + (void *) (long) item, NULL); +>>>>>>> 1.1.1.7 info_free_references (menu); return; diff --git a/gnu/dist/texinfo/info/terminal.c b/gnu/dist/texinfo/info/terminal.c index 907e01e6af0..00a3c53afdc 100644 --- a/gnu/dist/texinfo/info/terminal.c +++ b/gnu/dist/texinfo/info/terminal.c @@ -1,7 +1,7 @@ -/* $NetBSD: terminal.c,v 1.9 2004/07/12 23:41:53 wiz Exp $ */ +/* $NetBSD: terminal.c,v 1.10 2008/09/02 08:00:24 christos Exp $ */ /* terminal.c -- how to handle the physical terminal for Info. - Id: terminal.c,v 1.4 2004/03/27 15:35:55 karl Exp + Id: terminal.c,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/lib/Makefile.in b/gnu/dist/texinfo/lib/Makefile.in index e8643ad466a..d75e23c6c93 100644 --- a/gnu/dist/texinfo/lib/Makefile.in +++ b/gnu/dist/texinfo/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Id: Makefile.am,v 1.2 2004/03/11 13:08:36 karl Exp +# Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp # Makefile.am for texinfo/lib. # Run automake in .. to produce Makefile.in from this. # @@ -48,6 +48,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ subdir = lib DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -75,9 +76,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) AR = ar ARFLAGS = cru -LIBRARIES = $(noinst_LIBRARIES) libtxi_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = @LIBOBJS@ am__DEPENDENCIES_2 = @ALLOCA@ @@ -88,14 +89,6 @@ libtxi_a_OBJECTS = $(am_libtxi_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/alloca.Po $(DEPDIR)/memcpy.Po \ -@AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/mkstemp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strdup.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strerror.Po $(DEPDIR)/strncasecmp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/tempname.Po ./$(DEPDIR)/getopt.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/substring.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xexit.Po ./$(DEPDIR)/xmalloc.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xstrdup.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -142,6 +135,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -176,6 +171,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -188,6 +185,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,6 +208,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -220,8 +220,10 @@ noinst_LIBRARIES = libtxi.a INCLUDES = -I../intl # Don't need to list alloca.c, etc., Automake includes them. -libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_int.h gettext.h \ - substring.c system.h xalloc.h xexit.c xmalloc.c xstrdup.c +libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_.h getopt_int.h \ + gettext.h \ + strcase.h strdup.h substring.c system.h \ + xalloc.h xexit.c xmalloc.c xstrdup.c libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA) libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD) @@ -293,16 +295,14 @@ distclean-compile: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -326,9 +326,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -402,7 +404,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/gnu/dist/texinfo/lib/getopt.c b/gnu/dist/texinfo/lib/getopt.c index de0eacaddfd..fcdf619e7fb 100644 --- a/gnu/dist/texinfo/lib/getopt.c +++ b/gnu/dist/texinfo/lib/getopt.c @@ -1,4 +1,4 @@ -/* $NetBSD: getopt.c,v 1.6 2004/07/12 23:41:53 wiz Exp $ */ +/* $NetBSD: getopt.c,v 1.7 2008/09/02 08:00:24 christos Exp $ */ /* Getopt for GNU. NOTE: getopt is now part of the C library, so if you don't know what @@ -34,25 +34,6 @@ #include <stdio.h> -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ - -#define GETOPT_INTERFACE_VERSION 2 -#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 -# include <gnu-versions.h> -# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION -# define ELIDE_CODE -# endif -#endif - -#ifndef ELIDE_CODE - - /* This needs to come after some library #include to get __GNU_LIBRARY__ defined. */ #ifdef __GNU_LIBRARY__ @@ -1183,7 +1164,6 @@ getopt (int argc, char *const *argv, const char *optstring) 0); } -#endif /* Not ELIDE_CODE. */ #ifdef TEST diff --git a/gnu/dist/texinfo/lib/system.h b/gnu/dist/texinfo/lib/system.h index b38c91dd85e..44fcc17543f 100644 --- a/gnu/dist/texinfo/lib/system.h +++ b/gnu/dist/texinfo/lib/system.h @@ -1,7 +1,7 @@ -/* $NetBSD: system.h,v 1.7 2004/07/12 23:41:53 wiz Exp $ */ +/* $NetBSD: system.h,v 1.8 2008/09/02 08:00:24 christos Exp $ */ /* system.h: system-dependent declarations; include this first. - Id: system.h,v 1.7 2004/03/26 18:22:16 karl Exp + Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ extern void xexit (int); /* For convenience. */ #define STREQ(s1,s2) (strcmp (s1, s2) == 0) +#define STRCASEEQ(s1,s2) (strcasecmp (s1, s2) == 0) +#define STRNCASEEQ(s1,s2,n) (strncasecmp (s1, s2, n) == 0) /* We don't need anything fancy. If we did need something fancy, gnulib has it. */ diff --git a/gnu/dist/texinfo/m4/Makefile.in b/gnu/dist/texinfo/m4/Makefile.in index 81eeb6452cc..ac7e83ddd54 100644 --- a/gnu/dist/texinfo/m4/Makefile.in +++ b/gnu/dist/texinfo/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -33,6 +33,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ subdir = m4 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog @@ -98,6 +99,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -132,6 +135,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -144,6 +149,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -165,6 +172,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -287,7 +295,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/gnu/dist/texinfo/makeinfo/Makefile.in b/gnu/dist/texinfo/makeinfo/Makefile.in index b788dee5990..7653a34d93e 100644 --- a/gnu/dist/texinfo/makeinfo/Makefile.in +++ b/gnu/dist/texinfo/makeinfo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Id: Makefile.am,v 1.6 2004/03/08 22:45:54 karl Exp +# Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp # Makefile.am for texinfo/makeinfo. # Run automake in .. to produce Makefile.in from this. # @@ -48,6 +48,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = makeinfo$(EXEEXT) subdir = makeinfo @@ -90,15 +91,6 @@ makeinfo_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cmds.Po ./$(DEPDIR)/defun.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/files.Po ./$(DEPDIR)/float.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/footnote.Po ./$(DEPDIR)/html.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/index.Po ./$(DEPDIR)/insertion.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/lang.Po ./$(DEPDIR)/macro.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/makeinfo.Po ./$(DEPDIR)/multi.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/node.Po ./$(DEPDIR)/sectioning.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/toc.Po ./$(DEPDIR)/xml.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xref.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -152,6 +144,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -186,6 +180,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -198,6 +194,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -219,6 +217,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -326,16 +325,14 @@ distclean-compile: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -412,14 +409,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -429,9 +428,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -482,15 +483,17 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -522,7 +525,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/gnu/dist/texinfo/makeinfo/cmds.c b/gnu/dist/texinfo/makeinfo/cmds.c index b5e97417ac3..5fed6696e71 100644 --- a/gnu/dist/texinfo/makeinfo/cmds.c +++ b/gnu/dist/texinfo/makeinfo/cmds.c @@ -1,7 +1,7 @@ -/* $NetBSD: cmds.c,v 1.2 2004/07/14 00:12:28 wiz Exp $ */ +/* $NetBSD: cmds.c,v 1.3 2008/09/02 08:00:24 christos Exp $ */ /* cmds.c -- Texinfo commands. - Id: cmds.c,v 1.47 2004/04/07 20:17:38 karl Exp + Id: cmds.c,v 1.55 2004/12/14 00:15:36 karl Exp Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -84,6 +84,7 @@ COMMAND command_table[] = { { "OE", cm_special_char, BRACE_ARGS }, { "TeX", cm_TeX, BRACE_ARGS }, { "aa", cm_special_char, BRACE_ARGS }, + { "abbr", cm_abbr, BRACE_ARGS }, { "acronym", cm_acronym, BRACE_ARGS }, { "ae", cm_special_char, BRACE_ARGS }, { "afivepaper", cm_ignore_line, NO_BRACE_ARGS }, @@ -184,6 +185,7 @@ COMMAND command_table[] = { { "env", cm_code, BRACE_ARGS }, { "equiv", cm_equiv, BRACE_ARGS }, { "error", cm_error, BRACE_ARGS }, + { "euro", cm_special_char, BRACE_ARGS }, { "evenfooting", cm_ignore_line, NO_BRACE_ARGS }, { "evenheading", cm_ignore_line, NO_BRACE_ARGS }, { "everyfooting", cm_ignore_line, NO_BRACE_ARGS }, @@ -282,6 +284,7 @@ COMMAND command_table[] = { { "ringaccent", cm_accent, MAYBE_BRACE_ARGS }, { "rmacro", cm_rmacro, NO_BRACE_ARGS }, { "samp", cm_code, BRACE_ARGS }, + { "sansserif", cm_sansserif, BRACE_ARGS }, { "sc", cm_sc, BRACE_ARGS }, { "section", cm_section, NO_BRACE_ARGS }, { "set", cm_set, NO_BRACE_ARGS }, @@ -294,6 +297,7 @@ COMMAND command_table[] = { { "shortcaption", cm_caption, BRACE_ARGS }, { "shortcontents", cm_contents, NO_BRACE_ARGS }, { "shorttitlepage", cm_ignore_line, NO_BRACE_ARGS }, + { "slanted", cm_slanted, BRACE_ARGS }, { "smallbook", cm_ignore_line, NO_BRACE_ARGS }, { "smalldisplay", cm_smalldisplay, NO_BRACE_ARGS }, { "smallexample", cm_smallexample, NO_BRACE_ARGS }, @@ -648,37 +652,39 @@ cm_comment (void) cm_ignore_line (); } + + /* We keep acronyms with two arguments around, to be able to refer to them later with only one argument. */ static ACRONYM_DESC *acronyms_stack = NULL; -void -cm_acronym (int arg) +static void +cm_acronym_or_abbr (int arg, int is_abbr) { - char *acronym, *description; + char *aa, *description; unsigned len; /* We do everything at START. */ if (arg == END) return; - get_until_in_braces (",", &acronym); + get_until_in_braces (",", &aa); if (input_text[input_text_offset] == ',') input_text_offset++; get_until_in_braces ("}", &description); - canon_white (acronym); + canon_white (aa); canon_white (description); /* If not enclosed in braces, strip after comma to be compatible with texinfo.tex. */ - if (description[0] != '{' && index (description, ',') != NULL) + if (description[0] != '{' && strchr (description, ',') != NULL) { int i = 0; while (description[i] != ',') i++; /* For now, just terminate the string at comma. */ - description[i] = '\0'; + description[i] = 0; } /* Get description out of braces. */ @@ -687,14 +693,14 @@ cm_acronym (int arg) len = strlen (description); if (len && description[len-1] == '}') - description[len-1] = '\0'; + description[len-1] = 0; /* Save new description. */ if (strlen (description) > 0) { ACRONYM_DESC *new = xmalloc (sizeof (ACRONYM_DESC)); - new->acronym = xstrdup (acronym); + new->acronym = xstrdup (aa); new->description = xstrdup (description); new->next = acronyms_stack; acronyms_stack = new; @@ -702,7 +708,7 @@ cm_acronym (int arg) if (html) { - add_word ("<acronym"); + add_word (is_abbr ? "<abbr" : "<acronym"); if (strlen (description) > 0) add_word_args (" title=\"%s\"", text_expansion (description)); @@ -715,9 +721,11 @@ cm_acronym (int arg) while (temp) { - if (STREQ (acronym, temp->acronym) && strlen (temp->description) > 0) + if (STREQ (aa, temp->acronym) + && strlen (temp->description) > 0) { - add_word_args (" title=\"%s\"", text_expansion (temp->description)); + add_word_args (" title=\"%s\"", + text_expansion (temp->description)); break; } temp = temp->next; @@ -725,34 +733,34 @@ cm_acronym (int arg) } add_char ('>'); - execute_string ("%s", acronym); - add_word ("</acronym>"); + execute_string ("%s", aa); + add_word (is_abbr ? "</abbr>" : "</acronym>"); } else if (docbook) { - xml_insert_element (ACRONYM, START); - execute_string ("%s", acronym); - xml_insert_element (ACRONYM, END); + xml_insert_element (is_abbr ? ABBREV : ACRONYM, START); + execute_string ("%s", aa); + xml_insert_element (is_abbr ? ABBREV : ACRONYM, END); } else if (xml) { - xml_insert_element (ACRONYM, START); + xml_insert_element (is_abbr ? ABBREV : ACRONYM, START); - xml_insert_element (ACRONYMWORD, START); - execute_string ("%s", acronym); - xml_insert_element (ACRONYMWORD, END); + xml_insert_element (is_abbr ? ABBREVWORD : ACRONYMWORD, START); + execute_string ("%s", aa); + xml_insert_element (is_abbr ? ABBREVWORD : ACRONYMWORD, END); if (strlen (description) > 0) { - xml_insert_element (ACRONYMDESC, START); + xml_insert_element (is_abbr ? ABBREVDESC : ACRONYMDESC, START); execute_string ("%s", description); - xml_insert_element (ACRONYMDESC, END); + xml_insert_element (is_abbr ? ABBREVDESC : ACRONYMDESC, END); } - xml_insert_element (ACRONYM, END); + xml_insert_element (is_abbr ? ABBREV : ACRONYM, END); } else - execute_string ("%s", acronym); + execute_string ("%s", aa); /* Put description into parenthesis after the acronym for all outputs except XML. */ @@ -761,6 +769,18 @@ cm_acronym (int arg) } void +cm_acronym (int arg) +{ + cm_acronym_or_abbr (arg, 0); +} + +void +cm_abbr (int arg) +{ + cm_acronym_or_abbr (arg, 1); +} + +void cm_tt (int arg) { /* @t{} is a no-op in Info. */ @@ -808,7 +828,19 @@ cm_code (int arg) if (STREQ (command, "code")) insert_html_tag (arg, "code"); else - insert_html_tag_with_attribute (arg, "span", "class=\"%s\"", command); + { /* Use <samp> tag in general to get typewriter. */ + if (arg == START) + { /* If @samp specifically, add quotes a la TeX output. */ + if (STREQ (command, "samp")) add_char ('`'); + add_word ("<samp>"); + } + insert_html_tag_with_attribute (arg, "span", "class=\"%s\"",command); + if (arg == END) + { + add_word ("</samp>"); + if (STREQ (command, "samp")) add_char ('\''); + } + } } else { @@ -1074,11 +1106,15 @@ cm_strong (int arg, int start_pos, int end_pos) if (!xml && !html && !docbook && !no_headers && arg == END && end_pos - start_pos >= 6 - && strncmp ((char *) output_paragraph + start_pos, "*Note:*", 6) == 0) - /* Translators: "Note:" is literal here and should not be - translated. @strong{Nota}, say, does not cause the problem. */ - warning (_("@strong{Note:} produces a spurious cross-reference in Info; reword to avoid that")); - + && (STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note:", 6) + || STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note ", 6))) + { + /* Translators: "Note:" is literal here and should not be + translated. @strong{Nota}, say, does not cause the problem. */ + warning (_("@strong{Note...} produces a spurious cross-reference in Info; reword to avoid that")); + /* Adjust the output to avoid writing the bad xref. */ + output_paragraph[start_pos + 5] = '_'; + } } void @@ -1123,6 +1159,22 @@ cm_i (int arg) } void +cm_slanted (int arg) +{ + /* Make use of <lineannotation> of Docbook, if we are + inside an @example or similar. */ + extern int printing_index; + if (docbook && !filling_enabled && !printing_index) + xml_insert_element (LINEANNOTATION, arg); + else if (xml) + xml_insert_element (SLANTED, arg); + else if (html) + insert_html_tag (arg, "i"); + else + not_fixed_width (arg); +} + +void cm_b (int arg) { /* See cm_i comments. */ @@ -1155,6 +1207,21 @@ cm_r (int arg) } void +cm_sansserif (int arg) +{ + /* See cm_i comments. */ + extern int printing_index; + if (docbook && !filling_enabled && !printing_index) + xml_insert_element (LINEANNOTATION, arg); + else if (xml) + xml_insert_element (SANSSERIF, arg); + else if (html) + insert_html_tag_with_attribute (arg, "span", "class=\"sansserif\""); + else + not_fixed_width (arg); +} + +void cm_titlefont (int arg) { if (xml) @@ -1427,17 +1494,17 @@ cm_center (void) { if (xml) { - unsigned char *line; + char *line; xml_insert_element (CENTER, START); - get_rest_of_line (0, (char **)&line); - execute_string ("%s", (char *)line); + get_rest_of_line (0, &line); + execute_string ("%s", line); free (line); xml_insert_element (CENTER, END); } else { int i, start, length; - unsigned char *line; + char *line; int save_indented_fill = indented_fill; int save_filling_enabled = filling_enabled; int fudge_factor = 1; @@ -1450,8 +1517,8 @@ cm_center (void) add_html_block_elt ("<div align=\"center\">"); inhibit_output_flushing (); - get_rest_of_line (0, (char **)&line); - execute_string ("%s", (char *)line); + get_rest_of_line (0, &line); + execute_string ("%s", line); free (line); uninhibit_output_flushing (); if (html) diff --git a/gnu/dist/texinfo/makeinfo/files.c b/gnu/dist/texinfo/makeinfo/files.c index 7a83d40ef01..6ac071db759 100644 --- a/gnu/dist/texinfo/makeinfo/files.c +++ b/gnu/dist/texinfo/makeinfo/files.c @@ -1,7 +1,7 @@ -/* $NetBSD: files.c,v 1.7 2004/07/14 00:12:28 wiz Exp $ */ +/* $NetBSD: files.c,v 1.8 2008/09/02 08:00:24 christos Exp $ */ /* files.c -- file-related functions for makeinfo. - Id: files.c,v 1.15 2004/02/28 10:42:50 dirt Exp + Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -185,7 +185,10 @@ pop_path_from_include_path (void) } /* Find and load the file named FILENAME. Return a pointer to - the loaded file, or NULL if it can't be loaded. */ + the loaded file, or NULL if it can't be loaded. If USE_PATH is zero, + just look for the given file (this is used in handle_delayed_writes), + else search along include_files_path. */ + char * find_and_load (char *filename, int use_path) { @@ -197,10 +200,16 @@ find_and_load (char *filename, int use_path) result = fullpath = NULL; +<<<<<<< files.c if (use_path) fullpath = get_file_info_in_path (filename, include_files_path, &fileinfo); else fullpath = get_file_info_in_path (filename, NULL, &fileinfo); +======= + fullpath + = get_file_info_in_path (filename, use_path ? include_files_path : NULL, + &fileinfo); +>>>>>>> 1.1.1.5 if (!fullpath) goto error_exit; diff --git a/gnu/dist/texinfo/makeinfo/files.h b/gnu/dist/texinfo/makeinfo/files.h index 1f90c612793..4296b701109 100644 --- a/gnu/dist/texinfo/makeinfo/files.h +++ b/gnu/dist/texinfo/makeinfo/files.h @@ -1,9 +1,9 @@ -/* $NetBSD: files.h,v 1.2 2004/07/14 00:12:28 wiz Exp $ */ +/* $NetBSD: files.h,v 1.3 2008/09/02 08:00:24 christos Exp $ */ /* files.h -- declarations for files.c. - Id: files.h,v 1.7 2004/02/28 10:42:50 dirt Exp + Id: files.h,v 1.4 2004/07/27 00:06:31 karl Exp - Copyright (C) 1998, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2004 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 diff --git a/gnu/dist/texinfo/makeinfo/makeinfo.c b/gnu/dist/texinfo/makeinfo/makeinfo.c index 4fb4669d34f..ed1ab50627f 100644 --- a/gnu/dist/texinfo/makeinfo/makeinfo.c +++ b/gnu/dist/texinfo/makeinfo/makeinfo.c @@ -1,7 +1,7 @@ -/* $NetBSD: makeinfo.c,v 1.13 2004/07/14 00:12:28 wiz Exp $ */ +/* $NetBSD: makeinfo.c,v 1.14 2008/09/02 08:00:24 christos Exp $ */ /* makeinfo -- convert Texinfo source into other formats. - Id: makeinfo.c,v 1.63 2004/04/09 21:17:17 karl Exp + Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -185,7 +185,8 @@ remember_error (void) { fprintf (stderr, _("Too many errors! Gave up.\n")); flush_file_stack (); - cm_bye (); + if (errors_printed - max_error_level < 2) + cm_bye (); xexit (1); } } @@ -438,6 +439,8 @@ Conditional processing in input:\n\ --no-ifplaintext do not process @ifplaintext text.\n\ --no-iftex do not process @iftex and @tex text.\n\ --no-ifxml do not process @ifxml and @xml text.\n\ +\n\ + Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n\ ")); puts (_("\ @@ -517,6 +520,19 @@ struct option long_options[] = {NULL, 0, NULL, 0} }; +/* We use handle_variable_internal for -D and -U, and it depends on + execute_string, which depends on input_filename, which is not defined + while we are handling options. :-\ So we save these defines in this + struct, and handle them later. */ +typedef struct command_line_define +{ + struct command_line_define *next; + int action; + char *define; +} COMMAND_LINE_DEFINE; + +static COMMAND_LINE_DEFINE *command_line_defines = NULL; + /* For each file mentioned in the command line, process it, turning Texinfo commands into wonderfully formatted output text. */ int @@ -529,7 +545,9 @@ main (int argc, char **argv) /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing of the argument to @multicolumn. */ setlocale (LC_TIME, ""); +#ifdef LC_MESSAGES /* ultrix */ setlocale (LC_MESSAGES, ""); +#endif setlocale (LC_CTYPE, ""); setlocale (LC_COLLATE, ""); #endif @@ -604,7 +622,16 @@ main (int argc, char **argv) case 'D': case 'U': /* User specified variable to set or clear. */ - handle_variable_internal ((c == 'D') ? SET : CLEAR, optarg); + if (xml && !docbook) + { + COMMAND_LINE_DEFINE *new = xmalloc (sizeof (COMMAND_LINE_DEFINE)); + new->action = (c == 'D') ? SET : CLEAR; + new->define = xstrdup (optarg); + new->next = command_line_defines; + command_line_defines = new; + } + else + handle_variable_internal ((c == 'D' ? SET : CLEAR), optarg); break; case 'd': /* --docbook */ @@ -960,6 +987,8 @@ discard_until (char *string) if (temp < 0) { + /* not found, move current position to end of string */ + input_text_offset = input_text_length; if (strcmp (string, "\n") != 0) { /* Give a more descriptive feedback, if we are looking for ``@end '' during macro execution. That means someone used a multiline @@ -970,18 +999,14 @@ discard_until (char *string) line_error (_("Multiline command %c%s used improperly"), COMMAND_PREFIX, command); else - { - line_error (_("Expected `%s'"), string); - input_text_offset = input_text_length - strlen (string); - } + line_error (_("Expected `%s'"), string); free (end_block); return; } } else - input_text_offset = temp; - - input_text_offset += strlen (string); + /* found, move current position to after the found string */ + input_text_offset = temp + strlen (string); } /* Read characters from the file until we are at MATCH. @@ -1651,6 +1676,19 @@ convert_from_loaded_file (char *name) output_filename, VERSION, input_filename); close_paragraph (); + + if (xml && !docbook) + { + /* Just before the real main loop, let's handle the defines. */ + COMMAND_LINE_DEFINE *temp; + + for (temp = command_line_defines; temp; temp = temp->next) + { + handle_variable_internal (temp->action, temp->define); + free(temp->define); + } + } + reader_loop (); if (xml) xml_end_document (); @@ -1803,7 +1841,7 @@ init_internals (void) void init_paragraph (void) { - free_and_clear ((char **) &output_paragraph); + free (output_paragraph); output_paragraph = xmalloc (paragraph_buffer_len); output_paragraph[0] = 0; output_paragraph_offset = 0; @@ -2111,12 +2149,18 @@ reader_loop (void) { if (dash_count >= 2) { - html ? add_word ("—") : xml_insert_entity ("mdash"); + if (html) + add_word ("—"); + else + xml_insert_entity ("mdash"); dash_count -= 2; } else if (dash_count >= 1) { - html ? add_word ("–") : xml_insert_entity ("ndash"); + if (html) + add_word ("–"); + else + xml_insert_entity ("ndash"); dash_count--; } } @@ -2613,6 +2657,7 @@ add_char (int character) any order and with any omissions, and we'll still output the html <head> `just in time'. */ if ((executing_macro || !executing_string) + && !only_macro_expansion && html && !html_output_head_p && !defining_copying ()) html_output_head (); @@ -2785,7 +2830,7 @@ insert (int character) /* Insert the null-terminated string STRING into `output_paragraph'. */ void -insert_string (char *string) +insert_string (const char *string) { while (*string) insert (*string++); @@ -3241,18 +3286,20 @@ cm_image (int arg) else { sprintf (fullname, "%s.png", name_arg); - if (access (fullname, R_OK) != 0) - { - pathname = get_file_info_in_path (fullname, - include_files_path, &file_info); - if (pathname == NULL) - { - sprintf (fullname, "%s.jpg", name_arg); - if (access (fullname, R_OK) != 0) - pathname = get_file_info_in_path (fullname, + if (access (fullname, R_OK) != 0) { + pathname = get_file_info_in_path (fullname, + include_files_path, &file_info); + if (pathname == NULL) { + sprintf (fullname, "%s.jpg", name_arg); + if (access (fullname, R_OK) != 0) { + sprintf (fullname, "%s.gif", name_arg); + if (access (fullname, R_OK) != 0) { + pathname = get_file_info_in_path (fullname, include_files_path, &file_info); } + } } + } } if (html) @@ -3617,7 +3664,14 @@ cm_value (int arg, int start_pos, int end_pos) among other things. */ if (value) - execute_string ("%s", value); + { + /* We need to get past the closing brace since the value may + expand to a context-sensitive macro (e.g. @xref) and produce + spurious warnings */ + input_text_offset++; + execute_string ("%s", value); + input_text_offset--; + } else { warning (_("undefined flag: %s"), name); @@ -3953,13 +4007,23 @@ execute_string (format, va_alist) /* Return what would be output for STR (in newly-malloced memory), i.e., - expand Texinfo commands. If IMPLICIT_CODE is set, expand @code{STR}. - This is generally used for short texts; filling, indentation, and - html escapes are disabled. */ + expand Texinfo commands according to the current output format. If + IMPLICIT_CODE is set, expand @code{STR}. This is generally used for + short texts; filling, indentation, and html escapes are disabled. */ char * expansion (char *str, int implicit_code) { + return maybe_escaped_expansion (str, implicit_code, 0); +} + + +/* Do HTML escapes according to DO_HTML_ESCAPE. Needed in + cm_printindex, q.v. */ + +char * +maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape) +{ char *result; /* Inhibit indentation and filling, so that extra newlines @@ -3973,7 +4037,7 @@ expansion (char *str, int implicit_code) filling_enabled = 0; indented_fill = 0; no_indent = 1; - escape_html = 0; + escape_html = do_html_escape; result = full_expansion (str, implicit_code); @@ -3988,7 +4052,7 @@ expansion (char *str, int implicit_code) /* Expand STR (or @code{STR} if IMPLICIT_CODE is nonzero). No change to any formatting parameters -- filling, indentation, html escapes, - etc., are not reset. */ + etc., are not reset. Always returned in new memory. */ char * full_expansion (char *str, int implicit_code) diff --git a/gnu/dist/texinfo/makeinfo/node.c b/gnu/dist/texinfo/makeinfo/node.c index 384a67c2776..476e2c31ff3 100644 --- a/gnu/dist/texinfo/makeinfo/node.c +++ b/gnu/dist/texinfo/makeinfo/node.c @@ -1,7 +1,7 @@ -/* $NetBSD: node.c,v 1.3 2004/08/29 08:16:18 martin Exp $ */ +/* $NetBSD: node.c,v 1.4 2008/09/02 08:00:24 christos Exp $ */ /* node.c -- nodes for Texinfo. - Id: node.c,v 1.19 2004/02/29 13:23:51 dirt Exp + Id: node.c,v 1.27 2004/12/20 23:56:07 karl Exp Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -484,6 +484,53 @@ set_current_output_filename (const char *fname) current_output_filename = xstrdup (fname); } + +/* Output the <a name="..."></a> constructs for NODE. We output both + the new-style conversion and the old-style, if they are different. + See comments at `add_escaped_anchor_name' in html.c. */ + +static void +add_html_names (char *node) +{ + char *tem = expand_node_name (node); + char *otem = xstrdup (tem); + + /* Determine if the old and new schemes come up with different names; + only output the old scheme if that is so. We don't want to output + the same name twice. */ + canon_white (otem); + { + char *optr = otem; + int need_old = 0; + + for (; *optr; optr++) + { + if (!cr_or_whitespace (*optr) && !URL_SAFE_CHAR (*optr)) + { + need_old = 1; + break; + } + } + + if (need_old) + { + add_word ("<a name=\""); + add_anchor_name (otem, -1); /* old anchor name conversion */ + add_word ("\"></a>\n"); + } + free (otem); + } + + /* Always output the new scheme. */ + canon_white (tem); + add_word ("<a name=\""); + add_anchor_name (tem, 0); + add_word ("\"></a>\n"); + + free (tem); +} + + /* The order is: nodename, nextnode, prevnode, upnode. If all of the NEXT, PREV, and UP fields are empty, they are defaulted. You must follow a node command which has those fields defaulted @@ -924,12 +971,8 @@ cm_node (void) } if (!splitting && no_headers) - { /* cross refs need a name="#anchor" even if we're not writing headers*/ - add_word ("<a name=\""); - tem = expand_node_name (node); - add_anchor_name (tem, 0); - add_word ("\"></a>"); - free (tem); + { /* cross refs need a name="#anchor" even if not writing headers */ + add_html_names (node); } if (splitting || !no_headers) @@ -937,11 +980,12 @@ cm_node (void) add_html_block_elt ("<div class=\"node\">\n"); /* The <p> avoids the links area running on with old Lynxen. */ add_word_args ("<p>%s\n", splitting ? "" : "<hr>"); - add_word ("<a name=\""); - tem = expand_node_name (node); - add_anchor_name (tem, 0); - free (tem); - add_word ("\"></a>"); + + /* In the split HTML case, the filename is wrong for the + old-style converted names, but we'll add them anyway, for + consistency. (And we need them in the normal (not + no_headers) nonsplit case.) */ + add_html_names (node); if (next) { @@ -986,7 +1030,7 @@ cm_node (void) } /* html fixxme: we want a `top' or `contents' link here. */ - add_word_args ("\n%s<br>\n", splitting ? "<hr>" : ""); + add_word_args ("\n%s\n", splitting ? "<hr>" : ""); add_word ("</div>\n"); } } @@ -1623,7 +1667,7 @@ static char * enumerate_filename (char *pathname, char *basename, int number) { /* Do we need to generate names of subfiles which don't exceed 8+3 limits? */ - static const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname : "."); + const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname : "."); unsigned name_len = strlen (basename); char *filename = xmalloc (10 + strlen (pathname) + name_len); char *base_filename = xmalloc (10 + name_len); @@ -1888,7 +1932,7 @@ split_file (char *filename, int size) /* preserve local variables in info output. */ if (trailer) { - insert_string (trailer); + fwrite (trailer, 1, trailer_len, output_stream); free (trailer); } diff --git a/gnu/dist/texinfo/makeinfo/tests/Makefile.in b/gnu/dist/texinfo/makeinfo/tests/Makefile.in index 3206db77a5b..2f70dbd9b65 100644 --- a/gnu/dist/texinfo/makeinfo/tests/Makefile.in +++ b/gnu/dist/texinfo/makeinfo/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Id: Makefile.am,v 1.4 2004/04/09 21:21:07 karl Exp +# Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp # Makefile.am for texinfo/tests/makeinfo. # # This file is free software; as a special exception the author gives @@ -45,6 +45,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ subdir = makeinfo/tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -111,6 +112,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -145,6 +148,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -157,6 +162,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -178,6 +185,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -305,20 +313,20 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -374,7 +382,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/gnu/dist/texinfo/util/Makefile.in b/gnu/dist/texinfo/util/Makefile.in index 5156bc972f5..674cac270d7 100644 --- a/gnu/dist/texinfo/util/Makefile.in +++ b/gnu/dist/texinfo/util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Id: Makefile.am,v 1.6 2004/04/09 21:32:06 karl Exp +# Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp # Makefile.am for texinfo/util. # Run automake in .. to produce Makefile.in from this. # @@ -49,6 +49,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = ginstall-info$(EXEEXT) texindex$(EXEEXT) subdir = util @@ -76,7 +77,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) @@ -93,14 +95,18 @@ SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/install-info.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/texindex.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(ginstall_info_SOURCES) texindex.c DIST_SOURCES = $(ginstall_info_SOURCES) texindex.c +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_pkgdata_DATA) $(pkgdata_DATA) @@ -148,6 +154,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@ +INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -182,6 +190,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ +TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@ +TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -194,6 +204,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -215,6 +227,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +native_tools = @native_tools@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -222,24 +235,25 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -bin_SCRIPTS = texi2dvi +bin_SCRIPTS = texi2dvi texi2pdf # Use `ginstall-info' in the definition of PROGRAMS and in dependencies # because automake generates an install-info target in every Makefile (a # bug, IMHO, but this is easier than patching Automake.) -ginstall_info_SOURCES = install-info.c +ginstall_info_SOURCES = install-info.c localedir = $(datadir)/locale INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" LDADD = ../lib/libtxi.a $(LIBINTL) dist_pkgdata_DATA = texinfo.dtd texinfo.xsl pkgdata_DATA = texinfo.cat -# Most of these are for fun. The only one that's really supported is texi2dvi. -# +# Most of these are for fun. The only official/installed ones are the +# texi2* scripts. +# EXTRA_DIST = README deref.c dir-example fix-info-dir fixfonts \ fixref.gawk gdoc gen-dir-node gendocs.sh gendocs_template infosrch \ install-info-html outline.gawk \ - prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi txitextest \ + prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi texi2pdf txitextest \ $(dist_pkgdata_DATA) texinfo-cat.in CLEANFILES = $(pkgdata_DATA) @@ -338,16 +352,14 @@ distclean-compile: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @@ -355,7 +367,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA) test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done @@ -363,7 +375,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA) uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done @@ -372,7 +384,7 @@ install-pkgdataDATA: $(pkgdata_DATA) test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done @@ -380,7 +392,7 @@ install-pkgdataDATA: $(pkgdata_DATA) uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done @@ -405,9 +417,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -485,7 +499,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/gnu/dist/texinfo/util/install-info.c b/gnu/dist/texinfo/util/install-info.c index be702114f77..492db4d3a17 100644 --- a/gnu/dist/texinfo/util/install-info.c +++ b/gnu/dist/texinfo/util/install-info.c @@ -1,7 +1,7 @@ -/* $NetBSD: install-info.c,v 1.8 2004/07/12 23:41:53 wiz Exp $ */ +/* $NetBSD: install-info.c,v 1.9 2008/09/02 08:00:24 christos Exp $ */ /* install-info -- create Info directory entry(ies) for an Info file. - Id: install-info.c,v 1.8 2004/03/29 12:44:23 karl Exp + Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/util/texi2dvi b/gnu/dist/texinfo/util/texi2dvi index 0d058c91d32..4722f152a5e 100755 --- a/gnu/dist/texinfo/util/texi2dvi +++ b/gnu/dist/texinfo/util/texi2dvi @@ -1,6 +1,6 @@ #! /bin/sh # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources. -# Id: texi2dvi,v 1.3 2004/02/17 16:59:46 karl Exp +# Id: texi2dvi,v 1.34 2004/12/01 18:35:36 karl Exp # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, # 2002, 2003, 2004 Free Software Foundation, Inc. @@ -27,10 +27,10 @@ # the `--debug' option when making a bug report. # This string is expanded by rcs automatically when this file is checked out. -rcs_revision='Revision: 1.3' +rcs_revision='Revision: 1.34' rcs_version=`set - $rcs_revision; echo $2` program=`echo $0 | sed -e 's!.*/!!'` -version="texi2dvi (GNU Texinfo 4.7) $rcs_version +version="texi2dvi (GNU Texinfo 4.8) $rcs_version Copyright (C) 2004 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software @@ -65,7 +65,8 @@ TeX tuning: -I DIR search DIR for Texinfo files -l, --language=LANG specify the LANG of FILE (LaTeX or Texinfo) -p, --pdf use pdftex or pdflatex for processing - -t, --command=CMD insert CMD in copy of input file; + -r, --recode call recode before TeX to translate input characters + -t, --command=CMD insert CMD in copy of input file or --texinfo=CMD multiple values accumulate The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO, @@ -89,6 +90,7 @@ miincludes= # makeinfo include path oformat=dvi oname= # --output quiet= # by default let the tools' message be displayed +recode=false set_language= textra= # Extra TeX commands to insert in the input file. textra_cmd= # sed command to insert TEXTRA where appropriate @@ -114,7 +116,7 @@ CDPATH=${ZSH_VERSION+.}$path_sep : ${EGREP=egrep} # return true if program $1 is somewhere in PATH, else false. -# +# findprog () { foundprog=false for dir in `echo $PATH | tr "$path_sep" " "`; do @@ -170,7 +172,6 @@ while test x"$1" != x"$arg_sep"; do -@ ) escape=@;; # Silently and without documentation accept -b and --b[atch] as synonyms. -b | --b*) batch=true;; - -q | -s | --q* | --s*) quiet=t; batch=true;; -c | --c*) clean=t;; -D | --d*) debug=t;; -e | -E | --e*) expand=t;; @@ -189,6 +190,8 @@ while test x"$1" != x"$arg_sep"; do *) oname="$orig_pwd/$1";; esac;; -p | --p*) oformat=pdf;; + -q | -s | --q* | --s*) quiet=t; batch=true;; + -r | --r*) recode=true;; -t | --tex* | --com* ) shift; textra="$textra\\ "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;; -v | --vers*) echo "$version"; exit 0;; @@ -229,7 +232,7 @@ esac # We can't do much without tex. -# +# if findprog ${TEX:-tex}; then :; else cat <<EOM You don't have a working TeX binary (${TEX:-tex}) installed anywhere in your PATH, and texi2dvi cannot proceed without one. If you want to use @@ -249,7 +252,7 @@ fi # didn't explicitly specify. We don't check for elatex and pdfelatex # because (as of 2003), the LaTeX team has asked that new distributions # use etex by default anyway. -# +# # End up with the TEX and PDFTEX variables set to what we are going to use. if test -z "$TEX"; then if findprog etex; then TEX=etex; else TEX=tex; fi @@ -310,34 +313,32 @@ cat <<EOF >$uncomment_iftex_sed s/^@c texi2dvi// EOF -# A shell script that computes the list of xref files. +# Compute the list of xref files. # Takes the filename (without extension) of which we look for xref # files as argument. The index files must be reported last. -get_xref_files=$utildir/get_xref.sh -cat <<\EOF >$get_xref_files -#! /bin/sh - -# Get list of xref files (indexes, tables and lists). -# Find all files having root filename with a two-letter extension, -# saves the ones that are really Texinfo-related files. .?o? catches -# many files: .toc, .log, LaTeX tables and lists, FiXme's .lox, maybe more. -for this_file in "$1".?o? "$1".aux "$1".?? "$1".idx; do - # If file is empty, skip it. - test -s "$this_file" || continue - # If the file is not suitable to be an index or xref file, don't - # process it. It's suitable if the first character is a - # backslash or right quote, as long as the first line isn't - # \input texinfo. - first_character=`sed -n '1s/^\(.\).*$/\1/p;q' $this_file` - if (test "x$first_character" = "x\\" \ - && sed 1q $this_file | grep -v '^\\input *texinfo' >/dev/null) \ - || test "x$first_character" = "x'"; then - xref_files="$xref_files ./$this_file" - fi -done -echo "$xref_files" -EOF -chmod 500 $get_xref_files +get_xref_files () +{ + # Get list of xref files (indexes, tables and lists). + # Find all files having root filename with a two-letter extension, + # saves the ones that are really Texinfo-related files. .?o? catches + # many files: .toc, .log, LaTeX tables and lists, FiXme's .lox, maybe more. + for this_file in "$1".?o? "$1".aux "$1".?? "$1".idx; do + # If file is empty, skip it. + test -s "$this_file" || continue + # If the file is not suitable to be an index or xref file, don't + # process it. It's suitable if the first character is a + # backslash or right quote or at, as long as the first line isn't + # \input texinfo. + first_character=`sed -n '1s/^\(.\).*$/\1/p;q' $this_file` + if (test "x$first_character" = "x\\" \ + && sed 1q $this_file | grep -v '^\\input *texinfo' >/dev/null) \ + || test "x$first_character" = "x'" \ + || test "x$first_character" = "x@"; then + xref_files="$xref_files ./$this_file" + fi + done + echo "$xref_files" +} # File descriptor usage: # 0 standard input @@ -404,12 +405,16 @@ for command_line_filename in ${1+"$@"}; do tmpdir_xtr=$tmpdir/xtr filename_xtr=$tmpdir_xtr/$filename_noext.$ext + # _rcd. The Texinfo file recoded in 7bit. + tmpdir_rcd=$tmpdir/rcd + filename_rcd=$tmpdir_rcd/$filename_noext.$ext + # _bak. Copies of the previous xref files (another round is run if # they differ from the new one). tmpdir_bak=$tmpdir/bak # Make all those directories and give up if we can't succeed. - mkdir $tmpdir_src $tmpdir_xtr $tmpdir_bak || exit 1 + mkdir $tmpdir_src $tmpdir_xtr $tmpdir_rcd $tmpdir_bak || exit 1 # Source file might include additional sources. # We want `.:$orig_pwd' before anything else. (We'll add `.:' later @@ -488,6 +493,7 @@ for command_line_filename in ${1+"$@"}; do [lL]a[tT]e[xX] | *.ltx | *.tex) # Assume a LaTeX file. LaTeX needs bibtex and uses latex for # compilation. No makeinfo. + language=latex bibtex=${BIBTEX:-bibtex} makeinfo= # no point in running makeinfo on latex source. texindex=${MAKEINDEX:-makeindex} @@ -502,11 +508,18 @@ for command_line_filename in ${1+"$@"}; do *) # Assume a Texinfo file. Texinfo files need makeinfo, texindex and tex. + language=texinfo bibtex= texindex=${TEXINDEX:-texindex} textra_cmd='/^@setfilename/a' if test $oformat = dvi; then - tex=$TEX + # MetaPost also uses the TEX environment variable. If the user + # has set TEX=latex for that reason, don't bomb out. + if echo $TEX | grep 'latex$' >/dev/null; then + tex=tex # don't bother trying to find etex + else + tex=$TEX + fi else tex=$PDFTEX fi @@ -554,7 +567,7 @@ for command_line_filename in ${1+"$@"}; do # If possible, make TeX report error locations in GNU format. tex_args= case $tex_help in - *file-line-error-style*) tex_args="$tex_args --file-line-error-style";; + *file-line-error*) tex_args="$tex_args --file-line-error";; esac # Tell TeX to be batch if requested. (\batchmode does not show @@ -585,10 +598,30 @@ for command_line_filename in ${1+"$@"}; do if test -n "$textra"; then $verbose "Inserting extra commands: $textra" sed "$textra_cmd\\ -$textra" "$filename_input" >$filename_xtr +$textra" "$filename_input" >"$filename_xtr" filename_input=$filename_xtr fi + # If this is a Texinfo file with a specified input encoding, and + # recode is available, then recode to plain 7 bit Texinfo. + if test $language = texinfo; then + pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ + t found + d + :found + q' + encoding=`sed -e "$pgm" "$filename_input"` + if $recode && test -n "$encoding" && findprog recode; then + $verbose "Recoding from $encoding to Texinfo." + if recode "$encoding"..texinfo <"$filename_input" >"$filename_rcd" \ + && test -s "$filename_rcd"; then + filename_input=$filename_rcd + else + $verbose "Recoding failed, using original input." + fi + fi + fi + # If clean mode was specified, then move to the temporary directory. if test "$clean" = t; then $verbose "cd $tmpdir_src" @@ -596,7 +629,7 @@ $textra" "$filename_input" >$filename_xtr fi while :; do # will break out of loop below - orig_xref_files=`$get_xref_files "$filename_noext"` + orig_xref_files=`get_xref_files "$filename_noext"` # Save copies of originals for later comparison. if test -n "$orig_xref_files"; then @@ -657,13 +690,14 @@ $textra" "$filename_input" >$filename_xtr fi # Finally, run TeX. - cmd="$tex $tex_args $filename_input" + cmd="$tex $tex_args" $verbose "Running $cmd ..." - if $cmd >&5; then :; else - echo 1>&2 'TeX failed. If the above said "tex: not found", you may need to install TeX;' - echo 1>&2 'it is available from the pkgsrc system in print/teTeX.' - echo 1>&2 'If TeX is installed, make sure it is in your $PATH, or set the environment' - echo 1>&2 'variable $TEX to its location.' + if $cmd "$filename_input" >&5; then :; else + echo "$0: TeX failed. If the above said 'tex: not found', " >&2 + echo "$0: you may need to install TeX;" >&2 + echo "$0: it is available from the pkgsrc system in print/teTeX." >&2 + echo "$0: If TeX is installed, make sure it is in your $PATH, or" >&2 + echo "$0: set the environment variable $TEX to its location." >&2 echo "$0: $tex exited with bad status, quitting." >&2 echo "$0: see $filename_noext.log for errors." >&2 test "$clean" = t \ @@ -685,7 +719,7 @@ $textra" "$filename_input" >$filename_xtr fi # Check if xref files changed. - new_xref_files=`$get_xref_files "$filename_noext"` + new_xref_files=`get_xref_files "$filename_noext"` $verbose "Original xref files = `echo $orig_xref_files | sed 's|\./||g'`" $verbose "New xref files = `echo $new_xref_files | sed 's|\./||g'`" @@ -725,8 +759,8 @@ $textra" "$filename_input" >$filename_xtr $thumbpdf "$filename_noext" >&5 || fatal "$thumbpdf exited with bad status, quitting." - $verbose "Running $cmd ..." - if $cmd >&5; then :; else + $verbose "Running $cmd $filename_input..." + if $cmd "$filename_input" >&5; then :; else echo "$0: $tex exited with bad status, quitting." >&2 echo "$0: see $filename_noext.log for errors." >&2 test "$clean" = t \ diff --git a/gnu/dist/texinfo/util/texindex.c b/gnu/dist/texinfo/util/texindex.c index fb0d12dd633..15e14bf60a4 100644 --- a/gnu/dist/texinfo/util/texindex.c +++ b/gnu/dist/texinfo/util/texindex.c @@ -1,7 +1,7 @@ -/* $NetBSD: texindex.c,v 1.10 2006/12/01 18:21:04 drochner Exp $ */ +/* $NetBSD: texindex.c,v 1.11 2008/09/02 08:00:24 christos Exp $ */ /* texindex -- sort TeX index dribble output into an actual index. - Id: texindex.c,v 1.3 2004/03/18 22:26:53 karl Exp + Id: texindex.c,v 1.11 2004/04/11 17:56:47 karl Exp Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. |
