texinfo update (Fri Oct 8 18:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.395
retrieving revision 1.397
diff -c -r1.395 -r1.397
*** ChangeLog   7 Oct 2004 12:13:01 -0000       1.395
--- ChangeLog   8 Oct 2004 22:05:51 -0000       1.397
***************
*** 1,3 ****
--- 1,22 ----
+ 2004-10-08  Karl Berry  <address@hidden>
+ 
+       * info/Makefile.am (generated_sources): remove.  Found by Stepan.
+ 
+ 2004-10-08  Stepan Kasal  <address@hidden>
+ 
+       Support cross compiling.  Based on research by Mark Fortescue.
+       Maciej W. Rozycki pointed out this issue previously.
+ 
+       * configure.ac: If cross compiling, run second configure script
+         in a subdirectory ${native_tools}.  New automake conditional
+         TOOLS_ONLY is set inside that subdirectory.
+       * Makefile.am (SUBDIRS): Add $(native_tools); restrict the
+         SUBDIRS to minimum, if we are inside the $(native_toos) dir.
+       (distclean-local): Remove directory $(native_tools).
+       * doc/Makefile.am: If necessary, use makeinfo and install-info
+         from $(native_tools).
+       * info/Makefile.am: Similarily with the ``makedoc'' program.
+ 
  2004-10-07  Stepan Kasal  <address@hidden>
  
        @table command doesn't work inside environment @display.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** Makefile.am 11 Apr 2004 17:56:45 -0000      1.10
--- Makefile.am 8 Oct 2004 22:01:14 -0000       1.11
***************
*** 1,5 ****
  # Makefile.am for texinfo.
! # $Id: Makefile.am,v 1.10 2004/04/11 17:56:45 karl 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
--- 1,5 ----
  # Makefile.am for texinfo.
! # $Id: Makefile.am,v 1.11 2004/10/08 22:01:14 karl 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
***************
*** 21,31 ****
  # 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
  
  # for gettext.
  ACLOCAL_AMFLAGS = -I m4
--- 21,36 ----
  # distribution directory.
  TEXINFO_TEX = doc/texinfo.tex
  
! if TOOLS_ONLY
!   # Build native tools only.
!   SUBDIRS = lib info makeinfo util
! else
!   # 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 = $(native_tools) intl m4 lib info makeinfo po util doc
! endif
  
  # for gettext.
  ACLOCAL_AMFLAGS = -I m4
***************
*** 38,40 ****
--- 43,54 ----
  # 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.
+ if TOOLS_ONLY
+ install:
+ 
+ endif
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** NEWS        23 Sep 2004 13:18:08 -0000      1.92
--- NEWS        8 Oct 2004 22:01:14 -0000       1.93
***************
*** 1,4 ****
! $Id: NEWS,v 1.92 2004/09/23 13:18:08 karl Exp $
  This file records noteworthy changes.
  
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--- 1,4 ----
! $Id: NEWS,v 1.93 2004/10/08 22:01:14 karl Exp $
  This file records noteworthy changes.
  
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
***************
*** 28,33 ****
--- 28,34 ----
    . calls recode if installed and @documentencoding is specified.
  * Distribution:
    . new convenience script texi2pdf, equivalent to texi2dvi --pdf (from 
tetex).
+   . some cross-compiling support in configure && make.
    . automake 1.9.2.
  
  4.7 (9 April 2004)
Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** configure.ac        1 Oct 2004 18:04:46 -0000       1.39
--- configure.ac        8 Oct 2004 22:01:14 -0000       1.40
***************
*** 1,5 ****
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.39 2004/10/01 18:04:46 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
--- 1,5 ----
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.40 2004/10/08 22:01:14 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
***************
*** 79,84 ****
--- 79,102 ----
  # term library.
  AC_CANONICAL_BUILD
  
+ if test "$cross_compiling" = no; then
+     native_tools=
+ else
+     # Make twice, once locally, then with host compiler.
+     native_tools=tools
+     test -d "$native_tools" || mkdir "$native_tools"
+     confdir=`(cd "$srcdir";pwd)`
+     rm -f config.status
+     # Make sure the secondary configure won't complain
+     # that it's "already configured."
+     cd "$native_tools"
+     tools_only=1 $confdir/configure --build=${build} --host=${build} \
+       --disable-rpath --disable-nls
+     cd ..
+ 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=
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** doc/Makefile.am     13 Apr 2004 00:07:51 -0000      1.18
--- doc/Makefile.am     8 Oct 2004 22:01:14 -0000       1.19
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.18 2004/04/13 00:07:51 karl Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.19 2004/10/08 22:01:14 karl Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 17,25 ****
  man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
             info.5 texinfo.5
  
! # Use the programs built in our distribution.
! MAKEINFO = ../makeinfo/makeinfo
! INSTALL_INFO = ../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
--- 17,26 ----
  man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
             info.5 texinfo.5
  
! # Use the programs built in our distribution, taking account of possible
! # cross-compiling.
! MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
! 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
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** doc/version.texi    6 Oct 2004 21:29:49 -0000       1.19
--- doc/version.texi    8 Oct 2004 22:01:14 -0000       1.20
***************
*** 1,4 ****
! @set UPDATED 6 October 2004
  @set UPDATED-MONTH October 2004
  @set EDITION 4.7.90
  @set VERSION 4.7.90
--- 1,4 ----
! @set UPDATED 7 October 2004
  @set UPDATED-MONTH October 2004
  @set EDITION 4.7.90
  @set VERSION 4.7.90
Index: info/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.6
diff -c -r1.4 -r1.6
*** info/Makefile.am    11 Apr 2004 17:56:45 -0000      1.4
--- info/Makefile.am    8 Oct 2004 22:05:51 -0000       1.6
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.4 2004/04/11 17:56:45 karl Exp $
  # Makefile.am for texinfo/info.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.6 2004/10/08 22:05:51 karl Exp $
  # Makefile.am for texinfo/info.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 35,40 ****
--- 35,43 ----
  # to those functions along with completable names and documentation strings.
  BUILT_SOURCES = doc.c funs.h key.c
  
+ # We distribute the BUILT_SOURCES even though they get rebuilt by
+ # installers, just in case something goes wrong.  Then installers have
+ # the intended sources there to use or debug with.
  EXTRA_DIST = README pcterm.c $(BUILT_SOURCES)
  
  makedoc_SOURCES = makedoc.c
***************
*** 46,52 ****
    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)
  infokey_SOURCES = infokey.c infokey.h key.c key.h
  
  # Files with Info commands defined that makedoc should read.
--- 49,55 ----
    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)
  infokey_SOURCES = infokey.c infokey.h key.c key.h
  
  # Files with Info commands defined that makedoc should read.
***************
*** 57,60 ****
  # The $(EXEEXT) should be added by Automake, but isn't. Fine.
  $(BUILT_SOURCES): makedoc$(EXEEXT) $(cmd_sources)
        rm -f $(BUILT_SOURCES)
!       ./makedoc $(cmd_sources)
--- 60,63 ----
  # The $(EXEEXT) should be added by Automake, but isn't. Fine.
  $(BUILT_SOURCES): makedoc$(EXEEXT) $(cmd_sources)
        rm -f $(BUILT_SOURCES)
!       $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
P ChangeLog
P Makefile.am
P NEWS
P configure.ac
P doc/Makefile.am
P doc/version.texi
P info/Makefile.am