From b12d337486bb1b532ff35ad73b39e547b0c80474 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 2 Feb 2008 14:23:40 +0000 Subject: more autoconf updates git-svn-id: svn://tug.org/texlive/trunk@6488 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/ChangeLog | 8 ++ Build/source/Makefile.in | 1 + Build/source/configure.in | 28 ++-- Build/source/libs/ChangeLog | 8 ++ Build/source/libs/libpng/Makefile.in | 1 + Build/source/libs/zlib/Makefile.in | 1 + Build/source/texk/ChangeLog | 13 ++ Build/source/texk/Makefile.in | 1 + Build/source/texk/cjkutils/ChangeLog | 6 + Build/source/texk/cjkutils/configure.in | 3 +- Build/source/texk/configure.in | 34 +---- Build/source/texk/m4/ChangeLog | 6 + Build/source/texk/m4/kpse_subdirs.m4 | 73 ++++++++++ Build/source/texk/make/ChangeLog | 4 + Build/source/texk/make/README | 6 +- Build/source/texk/make/paths.mk | 1 + Build/source/utils/dialog/ChangeLog | 5 + Build/source/utils/dialog/configure.in | 3 +- Build/source/utils/texi2html/doc/texi2html.info | 181 ++++++++++++------------ 19 files changed, 245 insertions(+), 138 deletions(-) create mode 100644 Build/source/libs/ChangeLog create mode 100644 Build/source/texk/m4/kpse_subdirs.m4 create mode 100644 Build/source/utils/dialog/ChangeLog diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index add5f3a9406..043cc01ccf2 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,11 @@ +2008-02-02 Peter Breitenlohner + + Convert from autoconf-2.13 to autoconf-2.59+: + * configure.in: Use KPSE_CONFIG_SUBDIRS. + * Makefile.in: Add @configure_input@ line. + * aclocal.m4 (new): Generated (aclocal -I texk/m4). + * configure: Regenerated (autoconf). + 2007-10-06 Karl Berry * Build (TL_WORKDIR): allow override of "Work". diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index eb7ca589aed..6df2167f442 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -1,4 +1,5 @@ # $Id$ +# @configure_input@ # Makefile for teTeX distribution, also used for TeX Live. # This program is free software; you can redistribute it and/or modify diff --git a/Build/source/configure.in b/Build/source/configure.in index 97389304a77..0af317d2036 100644 --- a/Build/source/configure.in +++ b/Build/source/configure.in @@ -259,19 +259,21 @@ test "$needs_obsdcompat" = yes \ AC_CONFIG_SUBDIRS([libs]) -PKGS='dialog lcdf-typetools lzma-utils mkjobtexmf pdfopen ps2eps psutils t1utils texcount texi2html texinfo tpic2pdftex' -ESUBDIRS= -test -d utils || mkdir utils -for pkg in $PKGS; do - if test -d $srcdir/utils/$pkg; then - if eval "test \"`echo '$with_'${pkg}|sed 's/-/_/g'`\" != no"; then - ESUBDIRS="$ESUBDIRS utils/$pkg" - AC_CONFIG_SUBDIRS([utils/$pkg]) - fi - fi -done - -AC_SUBST(ESUBDIRS) +KPSE_CONFIG_SUBDIRS([ + dialog + lcdf-typetools + lzma-utils + mkjobtexmf + pdfopen + ps2eps + psutils + t1utils + texcount + texi2html + texinfo + tpic2pdftex +], [utils]) + AC_SUBST(LIBSDEP) AC_SUBST(LIBSDIRS) diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog new file mode 100644 index 00000000000..a83f8455e31 --- /dev/null +++ b/Build/source/libs/ChangeLog @@ -0,0 +1,8 @@ +2008-01-29 Peter Breitenlohner + + Convert from autoconf-2.13 to autoconf-2.59+: + * libpng/Makefile.in, zlib/Makefile.in: Add @configure_input@ + lines. + * aclocal.m4 (new): Generated (aclocal -I ../texk/m4). + * configure: Regenerated (autoconf). + diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 541f8a6eb94..b288d497a0d 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -1,3 +1,4 @@ +# @configure_input@ # Makefile for libpng - te@dbs.uni-hannover.de # This file (together with libpng.ac withenable.ac) is diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 0939e9abc17..4bcb52dbb9b 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -1,3 +1,4 @@ +# @configure_input@ # Thomas Esser, Makefile.in for zlib / teTeX. (C) 2002-2004, public domain. kpse_include ../texk/make/common.mk diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index 900a423f42c..68b63bfe88d 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,16 @@ +2008-02-02 Peter Breitenlohner + + Convert from autoconf-2.13 to autoconf-2.59+: + * configure.in: Use KPSE_CONFIG_SUBDIRS. + * Makefile.in: Add @configure_input@ line. + * aclocal.m4 (new): Generated (aclocal -I m4). + * configure: Regenerated (autoconf). + +2008-02-01 Peter Breitenlohner + + * configure.in: Removed configure kludge for dvipos. + * configure: Regenerated (autoconf2.13). + 2008-01-13 Karl Berry * withenable.ac (afm2pl, dtl): more --without options. diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 3f46fcc9407..876d6be80a3 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -1,3 +1,4 @@ +# @configure_input@ # Top-level Makefile for kpathsea-using programs. # Package subdirectories, the library, and all subdirectories. diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 776b81e96b2..0bcbc04b011 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,9 @@ +2008-01-31 Peter Breitenlohner + + * configure.in: Use AC_CONFIG_FILES([Makefile]) instead of + KPSE_CONFIG_FILES. + * configure: Regenerated. + 2008-01-30 Peter Breitenlohner Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/cjkutils/configure.in b/Build/source/texk/cjkutils/configure.in index d58f4628474..9e190434224 100644 --- a/Build/source/texk/cjkutils/configure.in +++ b/Build/source/texk/cjkutils/configure.in @@ -52,6 +52,7 @@ AC_PROG_INSTALL sinclude(../kpathsea/withenable.ac) -KPSE_CONFIG_FILES([Makefile conv/Makefile hbf2gf/Makefile scripts/Makefile]) +AC_CONFIG_FILES([Makefile]) +KPSE_CONFIG_FILES([conv/Makefile hbf2gf/Makefile scripts/Makefile]) AC_OUTPUT date >stamp-auto diff --git a/Build/source/texk/configure.in b/Build/source/texk/configure.in index 4a29b8147ac..ad060defe49 100644 --- a/Build/source/texk/configure.in +++ b/Build/source/texk/configure.in @@ -15,7 +15,7 @@ dnl AC_INIT(kpathsea/kpathsea.texi) dnl These configure scripts won't work with anything else. -AC_PREREQ(2.13) +AC_PREREQ(2.59) AC_PROG_MAKE_SET @@ -47,7 +47,9 @@ if test "x$with_x" = xno; then with_xdvik=no fi -PKGS=' +AC_CONFIG_SUBDIRS([kpathsea web2c]) + +KPSE_CONFIG_SUBDIRS([ afm2pl bibtex8 cjkutils @@ -76,33 +78,7 @@ PKGS=' xdv2pdf xdvik xdvipdfmx -' - -ESUBDIRS= -for pkg in $PKGS; do - if eval "test \"x`echo '$with_'${pkg}`\" != xno"; then - ESUBDIRS="$ESUBDIRS $pkg" - - if test "$pkg" = dvipos; then - # attempt to discover if srcdir = builddir. - dir_src=`cd $srcdir/dvipos && /bin/pwd` - dir_work=`/bin/pwd`/dvipos # may not exist, so don't cd - echo "testing configure kludge for dvipos..." - if test "$dir_src" != "$dir_work"; then - # this is a terrible kludge, but dvipos has no real configure - # and it is claimed crucial for context. - # So copy the entire sam2p srcdir into objdir. - rm -rf $dir_work - mkdir $dir_work - cp -pr $dir_src/* $dir_work/ # omit .svn - echo " copied dvipos dir_src ($dir_src) dir_work ($dir_work)" - fi - fi - fi -done -AC_SUBST(ESUBDIRS) - -AC_CONFIG_SUBDIRS(kpathsea web2c $ESUBDIRS) +]) KPSE_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/m4/ChangeLog b/Build/source/texk/m4/ChangeLog index c2f9c8c4c75..d5e2a58e8e6 100644 --- a/Build/source/texk/m4/ChangeLog +++ b/Build/source/texk/m4/ChangeLog @@ -1,3 +1,9 @@ +2008-02-02 Peter Breitenlohner + + * kpse_subdirs.m4 (new): Define KPSE_CONFIG_SUBDIRS, used in + ../configure.in and ../../configure.in in order to avoid shell + variables as arguments of AC_CONFIG_SUBDIRS. + 2008-01-29 Peter Breitenlohner Support for autoconf-2.59+: diff --git a/Build/source/texk/m4/kpse_subdirs.m4 b/Build/source/texk/m4/kpse_subdirs.m4 new file mode 100644 index 00000000000..70afe18fdac --- /dev/null +++ b/Build/source/texk/m4/kpse_subdirs.m4 @@ -0,0 +1,73 @@ +# Private macros for the kpathsea library. +# by Peter Breitenlohner +# Copyright (C) 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# KPSE_CONFIG_SUBDIRS(PKGLIST, [DIR]) +# ----------------------------------- +# Specify optional subdirectories to be configured. +# First the shell variable ESUBDIRS initialize (to empty). Then for +# each PKG in PKGLIST, test if PKG (or optionally DIR/PKG) exists as +# subdirectory of $srcdir and the value of the shell variable with_PKG +# differs from "no"; if so append this subdirectoryi to the list of +# subdirectories to be configured and to the shell variable ESUBDIRS. +# Finally ESUBDIRS is AC_SUBSTed. +# +# Examples: KPSE_CONFIG_SUBDIRS([dialog lcdf-typetools], [utils]) is +# roughly equivalent to the shell code +# ESUBDIRS= +# test -d utils || mkdir utils +# for pkg in $PKGS; do +# if test -d $srcdir/utils/$pkg; then +# if eval "test \"`echo '$with_'${pkg}|sed 's/-/_/g'`\" != no"; then +# ESUBDIRS="$ESUBDIRS utils/$pkg" +# AC_CONFIG_SUBDIRS([utils/$pkg]) +# fi +# fi +# done +# AC_SUBST(ESUBDIRS) +# whereas KPSE_CONFIG_SUBDIRS([afm2pl bibtex8]) corresponds to +# ESUBDIRS= +# for pkg in $PKGS; do +# if test -d $srcdir/utils/$pkg; then +# if eval "test \"x`echo '$with_'${pkg}`\" != xno"; then +# ESUBDIRS="$ESUBDIRS $pkg" +# AC_CONFIG_SUBDIRS([$pkg]) +# fi +# fi +# done +# AC_SUBST(ESUBDIRS) +# +# The main difference is that these macros replace the shell loop by +# an M4 loop and therefore M4 variables (i.e., shell literals) are +# passed as arguments to AC_CONFIG_SUBDIRS, as required by modern +# versions of Autoconf and Automake. + +AC_DEFUN([KPSE_CONFIG_SUBDIRS], +[ESUBDIRS= +m4_ifval([$2], [test -d $2 || mkdir $2]) +AC_FOREACH([AC_Pkg], [$1], + [_KPSE_CONFIG_SUBDIR(m4_ifval([$2], [$2/])AC_Pkg, + [with_]m4_bpatsubst(AC_Pkg, [-], [_]))]) +AC_SUBST(ESUBDIRS)dnl +]) + +# _KPSE_CONFIG_SUBDIR(DIR, WITH_VAR) +# ---------------------------------- +# See above; test if $srcdir/DIR exists and $WITH_VAR != no; if so +# append DIR to the list of subdirectories to be configured. +m4_define([_KPSE_CONFIG_SUBDIR], +[if test -d $srcdir/$1; then + if test "x$[]$2" != xno; then + ESUBDIRS="$ESUBDIRS $1" + AC_CONFIG_SUBDIRS([$1])dnl + fi +fi +]) + diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog index 491b7f5e37e..7fb81d13b00 100644 --- a/Build/source/texk/make/ChangeLog +++ b/Build/source/texk/make/ChangeLog @@ -1,3 +1,7 @@ +2008-02-02 Peter Breitenlohner + + * paths.mk: Add datarootdir for Autoconf 2.60+. + 2007-07-29 Karl Berry * rdepend.mk: replace all texk/kpathsea, not just first. diff --git a/Build/source/texk/make/README b/Build/source/texk/make/README index 9481d74b7d5..88a1364ba82 100644 --- a/Build/source/texk/make/README +++ b/Build/source/texk/make/README @@ -10,9 +10,9 @@ kb@mail.tug.org With the long overdue transition from autoconf-2.13 to autoconf-2.59+ this is handled as follows: -Every 'ac_include' in Makefile.in are replaced by 'kpse_include' and the -command 'AC_CONFIG_FILES([Makefile])' in configure.in (or configure.ac) -is replaced by 'KPSE_CONFIG_FILES([Makefile])'. +Each 'ac_include' in Makefile.in is replaced by 'kpse_include' and the +command 'AC_CONFIG_FILES([Makefile])' in configure.in or configure.ac is +replaced by 'KPSE_CONFIG_FILES([Makefile])'. The macro KPSE_CONFIG_FILES (defined in kpse_inc.m4) uses standard autoconf mechanisms to achieve the desired substitutions. diff --git a/Build/source/texk/make/paths.mk b/Build/source/texk/make/paths.mk index 7a18924ad0f..d0aee38aa68 100644 --- a/Build/source/texk/make/paths.mk +++ b/Build/source/texk/make/paths.mk @@ -22,6 +22,7 @@ scriptdir = $(bindir) libdir = @libdir@ # Architecture-independent files. +datarootdir = @datarootdir@ datadir = @datadir@ # Header files. diff --git a/Build/source/utils/dialog/ChangeLog b/Build/source/utils/dialog/ChangeLog new file mode 100644 index 00000000000..f063f774052 --- /dev/null +++ b/Build/source/utils/dialog/ChangeLog @@ -0,0 +1,5 @@ +2008-01-29 Peter Breitenlohner + + Convert from autoconf-2.13 to autoconf-2.59+: + * configure.in: Updated syntax. + * configure: Regenerated (autoconf). diff --git a/Build/source/utils/dialog/configure.in b/Build/source/utils/dialog/configure.in index 41b0cef8fd1..b1fc1b59026 100644 --- a/Build/source/utils/dialog/configure.in +++ b/Build/source/utils/dialog/configure.in @@ -17,4 +17,5 @@ sinclude(../../libs/ncurses/ncurses.ac) dnl ac_configure_args=`echo "$ac_configure_args" | sed 's@--prefix=[[^ ]]*@@'` -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/Build/source/utils/texi2html/doc/texi2html.info b/Build/source/utils/texi2html/doc/texi2html.info index c868298c367..4e32884ec48 100644 --- a/Build/source/utils/texi2html/doc/texi2html.info +++ b/Build/source/utils/texi2html/doc/texi2html.info @@ -1,6 +1,5 @@ -This is ../../../../TeXlive-svn/utils/texi2html/doc/texi2html.info, -produced by makeinfo version 4.8 from -../../../../TeXlive-svn/utils/texi2html/doc/texi2html.texi. +This is texi2html.info, produced by makeinfo version 4.8 from +texi2html.texi. Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. @@ -3546,93 +3545,93 @@ Appendix D Concept Index  Tag Table: -Node: Top3047 -Node: Overview5675 -Node: whytexi2html7465 -Node: Obtaining texi2html9548 -Node: Installation9831 -Node: Invoking texi2html12021 -Node: Splitting output13201 -Node: Output files16535 -Node: Expansion19797 -Node: Texinfo related options20706 -Node: Page layout options21773 -Node: Style options22670 -Node: Expanding TeX regions24990 -Node: Using init files26136 -Node: Initialization files28025 -Node: Redefining functions29972 -Node: Function prototypes31038 -Node: Changing the page layout32114 -Node: The different pages33472 -Node: The page layout35190 -Ref: Element labels36474 -Node: Navigation panel38203 -Node: General purpose variables38866 -Node: Button specifications39643 -Node: Panel formatting function42979 -Node: Program variables43778 -Node: Elements hashes44488 -Node: Global informations45007 -Node: Global functions47527 -Node: Output initialization48272 -Node: Output finalization49735 -Node: css50212 -Node: Customizing header51284 -Node: Customizing section54097 -Node: Customizing footer55101 -Node: Special pages56981 -Node: Special pages content57315 -Node: Top element text57619 -Node: Contents and Overview text58908 -Node: Footnotes text61657 -Node: About text61965 -Node: Special pages layout63485 -Node: File names64686 -Node: External index files66567 -Node: Customizing HTML68697 -Node: Three contexts70419 -Node: Commands without argument71193 -Node: Style and accent commands72615 -Node: Hash reference interface74108 -Ref: Reference hash args74984 -Node: String interface77354 -Node: Define your own interface79339 -Node: Anchors images and spaces81059 -Node: Text83933 -Node: Strings85269 -Node: References86859 -Node: Reference to external manual87066 -Node: Internal reference89070 -Node: Alignement commands90006 -Node: Paragraph and preformatted region90970 -Node: Paragraph and preformatted formatting91306 -Node: Avoiding paragraphs95043 -Node: Complex formats95448 -Node: Lists tables97145 -Node: Table and list items97617 -Node: Whole table list101562 -Node: Definitions103116 -Node: Definition line103598 -Node: Definition formatting105051 -Node: Headings106503 -Node: Special regions107470 -Node: Menus109508 -Node: Menu parts109960 -Node: Menu formatting111389 -Node: Indices114296 -Node: Index entry place114973 -Node: Index list115596 -Node: Floats and lists of floats118701 -Node: Floats120186 -Node: Lists of floats121502 -Node: Footnotes123731 -Node: Other and unknown commands126246 -Node: Internationalization130195 -Node: Translating strings130625 -Node: Adding new strings132283 -Node: Indexop133160 -Node: Indexvr137004 -Node: Indexcp150789 +Node: Top2959 +Node: Overview5587 +Node: whytexi2html7377 +Node: Obtaining texi2html9460 +Node: Installation9743 +Node: Invoking texi2html11933 +Node: Splitting output13113 +Node: Output files16447 +Node: Expansion19709 +Node: Texinfo related options20618 +Node: Page layout options21685 +Node: Style options22582 +Node: Expanding TeX regions24902 +Node: Using init files26048 +Node: Initialization files27937 +Node: Redefining functions29884 +Node: Function prototypes30950 +Node: Changing the page layout32026 +Node: The different pages33384 +Node: The page layout35102 +Ref: Element labels36386 +Node: Navigation panel38115 +Node: General purpose variables38778 +Node: Button specifications39555 +Node: Panel formatting function42891 +Node: Program variables43690 +Node: Elements hashes44400 +Node: Global informations44919 +Node: Global functions47439 +Node: Output initialization48184 +Node: Output finalization49647 +Node: css50124 +Node: Customizing header51196 +Node: Customizing section54009 +Node: Customizing footer55013 +Node: Special pages56893 +Node: Special pages content57227 +Node: Top element text57531 +Node: Contents and Overview text58820 +Node: Footnotes text61569 +Node: About text61877 +Node: Special pages layout63397 +Node: File names64598 +Node: External index files66479 +Node: Customizing HTML68609 +Node: Three contexts70331 +Node: Commands without argument71105 +Node: Style and accent commands72527 +Node: Hash reference interface74020 +Ref: Reference hash args74896 +Node: String interface77266 +Node: Define your own interface79251 +Node: Anchors images and spaces80971 +Node: Text83845 +Node: Strings85181 +Node: References86771 +Node: Reference to external manual86978 +Node: Internal reference88982 +Node: Alignement commands89918 +Node: Paragraph and preformatted region90882 +Node: Paragraph and preformatted formatting91218 +Node: Avoiding paragraphs94955 +Node: Complex formats95360 +Node: Lists tables97057 +Node: Table and list items97529 +Node: Whole table list101474 +Node: Definitions103028 +Node: Definition line103510 +Node: Definition formatting104963 +Node: Headings106415 +Node: Special regions107382 +Node: Menus109420 +Node: Menu parts109872 +Node: Menu formatting111301 +Node: Indices114208 +Node: Index entry place114885 +Node: Index list115508 +Node: Floats and lists of floats118613 +Node: Floats120098 +Node: Lists of floats121414 +Node: Footnotes123643 +Node: Other and unknown commands126158 +Node: Internationalization130107 +Node: Translating strings130537 +Node: Adding new strings132195 +Node: Indexop133072 +Node: Indexvr136916 +Node: Indexcp150701  End Tag Table -- cgit v1.2.3