From 0c7c5013ed0bbc12b2bcbd255cf4989ebc855d69 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 Jun 2020 18:00:56 +0000 Subject: omit $Id$ in generated output; it is useful, but too painful to commit autosources and generated files separately git-svn-id: svn://tug.org/texlive/trunk@55466 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/Makefile.in | 6 +++++- Build/source/utils/autosp/ChangeLog | 4 ++++ Build/source/utils/autosp/Makefile.am | 6 +++--- Build/source/utils/autosp/ac/withenable.ac | 6 +++--- Build/source/utils/axodraw2/ChangeLog | 8 ++++++++ Build/source/utils/axodraw2/ac/withenable.ac | 6 +++--- Build/source/utils/axodraw2/configure | 20 ++++++++++---------- Build/source/utils/axodraw2/configure.ac | 10 +++++----- Build/source/utils/configure | 16 ++++++---------- Build/source/utils/xindy/ChangeLog | 4 ++++ Build/source/utils/xindy/ac/withenable.ac | 8 ++++---- 11 files changed, 55 insertions(+), 39 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 4fc12e1e2a7..186d07444c9 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -417,7 +417,11 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' recurse_this = utils/ recurse_top = ../ -# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $ +# am/recurse.am: Makefile fragment to configure and build subdirs. +# +# Copyright 2017-2020 Karl Berry +# Copyright 2013 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. # # Requires $(recurse_this) and $(recurse_top). # Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog index cea86cadd8e..b260eef51a8 100644 --- a/Build/source/utils/autosp/ChangeLog +++ b/Build/source/utils/autosp/ChangeLog @@ -1,3 +1,7 @@ +2020-06-07 Karl Berry + + * ac/withenable.ac: omit $Id$ from generated output. + 2020-02-07 Akira Kakuto * Import autosp-2020-02-06. diff --git a/Build/source/utils/autosp/Makefile.am b/Build/source/utils/autosp/Makefile.am index 94d4c76fec9..169f6506dd6 100644 --- a/Build/source/utils/autosp/Makefile.am +++ b/Build/source/utils/autosp/Makefile.am @@ -1,7 +1,7 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory utils/autosp/ ## -## Copyright 2016-2018 Karl Berry +## Copyright 2016-2020 Karl Berry ## You may freely use, modify and/or distribute this file. ## We want to re-distribute the whole original ps2eps source tree. @@ -13,8 +13,8 @@ NEVER_NAMES += $(NEVER_NAMES_SUB) AM_CFLAGS = $(WARNING_CFLAGS) -# We intentionally omit the rebar program, since the name just seems to -# be generic to end up in system bindirs, and it's said to just be a +# We intentionally omit the rebar program, since the name seems too +# generic to end up in system bindirs, and it's said to only be a # convenience. People can get it from the Werner Icking Music Archive. bin_PROGRAMS = autosp tex2aspc diff --git a/Build/source/utils/autosp/ac/withenable.ac b/Build/source/utils/autosp/ac/withenable.ac index bab1844784e..93dce0db75e 100644 --- a/Build/source/utils/autosp/ac/withenable.ac +++ b/Build/source/utils/autosp/ac/withenable.ac @@ -1,7 +1,7 @@ -## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir -## $Id$ +## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir +dnl $Id$ dnl -dnl Copyright 2016--2018 Karl Berry +dnl Copyright 2016-2020 Karl Berry dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for autosp. diff --git a/Build/source/utils/axodraw2/ChangeLog b/Build/source/utils/axodraw2/ChangeLog index 7a3000318c1..92371f1d65c 100644 --- a/Build/source/utils/axodraw2/ChangeLog +++ b/Build/source/utils/axodraw2/ChangeLog @@ -1,3 +1,11 @@ +2020-06-07 Karl Berry + + * configure.ac, + * ac/withenable.ac: omit $Id$ from generated output. + + * configure.ac (AC_CHECK_LIB([m]): check for erf, not sqrt. + (Missed this in earlier changes in other dirs.) + 2019-09-07 Akira Kakuto Import v1.3 from ctan.org/pkg/axodraw2. diff --git a/Build/source/utils/axodraw2/ac/withenable.ac b/Build/source/utils/axodraw2/ac/withenable.ac index 8208d94b072..8bfeb759b5f 100644 --- a/Build/source/utils/axodraw2/ac/withenable.ac +++ b/Build/source/utils/axodraw2/ac/withenable.ac @@ -1,7 +1,7 @@ -## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir -## $Id$ +## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir +dnl $Id$ dnl -dnl Copyright 2018 Karl Berry +dnl Copyright 2018-2020 Karl Berry dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries for axodraw2. diff --git a/Build/source/utils/axodraw2/configure b/Build/source/utils/axodraw2/configure index 3c60d0d64fa..6eef9a8b333 100755 --- a/Build/source/utils/axodraw2/configure +++ b/Build/source/utils/axodraw2/configure @@ -3616,9 +3616,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if ${ac_cv_lib_m_sqrt+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for erf in -lm" >&5 +$as_echo_n "checking for erf in -lm... " >&6; } +if ${ac_cv_lib_m_erf+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3632,27 +3632,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char sqrt (); +char erf (); int main () { -return sqrt (); +return erf (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sqrt=yes + ac_cv_lib_m_erf=yes else - ac_cv_lib_m_sqrt=no + ac_cv_lib_m_erf=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_erf" >&5 +$as_echo "$ac_cv_lib_m_erf" >&6; } +if test "x$ac_cv_lib_m_erf" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF diff --git a/Build/source/utils/axodraw2/configure.ac b/Build/source/utils/axodraw2/configure.ac index a7c325de032..1d381273530 100644 --- a/Build/source/utils/axodraw2/configure.ac +++ b/Build/source/utils/axodraw2/configure.ac @@ -1,7 +1,7 @@ -# $Id$ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. -dnl Copyright 2018 John Collins +dnl $Id$ +dnl -*- Autoconf -*- +dnl Process this file with autoconf to produce a configure script. +dnl Copyright 2018-2020 John Collins dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4]) KPSE_BASIC([axodraw2], [no-define]) -AC_CHECK_LIB([m], [sqrt],, +AC_CHECK_LIB([m], [erf],, AC_MSG_ERROR([*** Please install libm on your system ***])) AC_PROG_CC diff --git a/Build/source/utils/configure b/Build/source/utils/configure index e00c94764a8..051e7071386 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -3379,8 +3379,7 @@ $as_echo "$as_me: $host -> \`--disable-mfluajit-nowin'" >&6;} esac ;; esac -## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir -## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $ +## utils/autosp/ac/withenable.ac: configure.ac fragment for Tl subdir ## configure options and TL libraries required for autosp. # Check whether --enable-autosp was given. if test "${enable_autosp+set}" = set; then : @@ -3398,8 +3397,7 @@ $as_echo "$as_me: Assuming \`--enable-autosp=$enable_autosp'" >&6;} ;; esac -## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir -## $Id: withenable.ac 46590 2018-02-10 23:30:32Z karl $ +## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir ## configure options and TL libraries for axodraw2. # Check whether --enable-axodraw2 was given. if test "${enable_axodraw2+set}" = set; then : @@ -3579,9 +3577,8 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;} ;; esac -# $Id: withenable.ac 49993 2019-02-10 19:14:27Z karl $ -# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ -## configure options and TL libraries required for xindy +## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir +## configure options and TL libraries required for xindy. # Check whether --enable-xindy was given. if test "${enable_xindy+set}" = set; then : enableval=$enable_xindy; @@ -3693,9 +3690,8 @@ test "x$enable_web2c" = xno || { need_zlib=yes } -# $Id: web2c.ac 55138 2020-05-14 17:47:47Z karl $ -# texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ -## configure options for TeX and MF +# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir +# configure options for TeX and MF # Check whether --with-banner-add was given. if test "${with_banner_add+set}" = set; then : diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index 2b969a0acdd..6fd49c7fcfe 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2020-06-07 Karl Berry + + * ac/withenable.ac: omit $Id$ from generated output. + 2020-05-28 J\"urgen Spitzm\"uller These patches from: diff --git a/Build/source/utils/xindy/ac/withenable.ac b/Build/source/utils/xindy/ac/withenable.ac index 29136c48e34..9cace7a5700 100644 --- a/Build/source/utils/xindy/ac/withenable.ac +++ b/Build/source/utils/xindy/ac/withenable.ac @@ -1,11 +1,11 @@ -# $Id$ -# utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ +## utils/xindy/ac/withenable.ac: configure.ac fragment for TL subdir +dnl $Id$ dnl -dnl Copyright 2009-2018 Karl Berry +dnl Copyright 2009-2020 Karl Berry dnl Copyright 2009-2010 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl -## configure options and TL libraries required for xindy +## configure options and TL libraries required for xindy. KPSE_ENABLE_PROG([xindy], , [disable]) m4_include(kpse_TL[utils/xindy/ac/xindy.ac]) m4_include(kpse_TL[utils/xindy/ac/clisp.ac]) -- cgit v1.2.3