Build system: Minor cleanup

git-svn-id: svn://tug.org/texlive/trunk@36303 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 41 insertions, 95 deletions

diff --git a/Build/source/configure b/Build/source/configure
index 545343e22d4..12eb19f6e5a 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -798,7 +798,6 @@ enable_xindy
 enable_xindy_rules
 enable_xindy_docs
 with_clisp_runtime
-with_xindy_recode
 enable_xpdfopen
 enable_web2c
 with_banner_add
@@ -1618,7 +1617,7 @@ Optional Features:
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
-  --disable-dump-share      make fmt/base/mem files architecture-dependent
+  --disable-dump-share      make fmt/base files architecture-dependent
   --disable-ipc             disable TeX's --ipc option, i.e., pipe to a
                             program
   --disable-tex             do not compile and install TeX
@@ -1655,7 +1654,7 @@ Optional Features:
   --enable-tektronixwin       include Tektronix window support
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --disable-synctex         do not build the SyncTeX tool
+  --disable-synctex         do not build the SyncTeX library and tool
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex-x      do not build the bibtex-x package
   --disable-bibtex8         do not build the bibtex8 program
@@ -1741,8 +1740,6 @@ Optional Packages:
                           pathname of clisp runtime to install for `xindy',
                           `default' to derive from clisp, or `system' to use
                           installed version
-  --with-xindy-recode     use `recode' instead of `iconv' to build xindy
-                          [default: no]
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
@@ -4344,11 +4341,6 @@ if test "${with_clisp_runtime+set}" = set; then :
   withval=$with_clisp_runtime;
 fi
 
-# Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then :
-  withval=$with_xindy_recode;
-fi
-
 ## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure checks for xindy and clisp
 case $with_clisp_runtime in #(
@@ -4751,8 +4743,7 @@ fi
 if test "${enable_web_progs+set}" = set; then :
   enableval=$enable_web_progs;
 fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
 # Check whether --enable-synctex was given.
 if test "${enable_synctex+set}" = set; then :
   enableval=$enable_synctex;
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 97988cc9256..db499f706f5 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -709,7 +709,6 @@ enable_xindy
 enable_xindy_rules
 enable_xindy_docs
 with_clisp_runtime
-with_xindy_recode
 enable_xpdfopen
 enable_web2c
 with_banner_add
@@ -1523,7 +1522,7 @@ Optional Features:
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
-  --disable-dump-share      make fmt/base/mem files architecture-dependent
+  --disable-dump-share      make fmt/base files architecture-dependent
   --disable-ipc             disable TeX's --ipc option, i.e., pipe to a
                             program
   --disable-tex             do not compile and install TeX
@@ -1560,7 +1559,7 @@ Optional Features:
   --enable-tektronixwin       include Tektronix window support
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --disable-synctex         do not build the SyncTeX tool
+  --disable-synctex         do not build the SyncTeX library and tool
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex-x      do not build the bibtex-x package
   --disable-bibtex8         do not build the bibtex8 program
@@ -1640,8 +1639,6 @@ Optional Packages:
                           pathname of clisp runtime to install for `xindy',
                           `default' to derive from clisp, or `system' to use
                           installed version
-  --with-xindy-recode     use `recode' instead of `iconv' to build xindy
-                          [default: no]
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
@@ -3588,11 +3585,6 @@ if test "${with_clisp_runtime+set}" = set; then :
   withval=$with_clisp_runtime;
 fi
 
-# Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then :
-  withval=$with_xindy_recode;
-fi
-
 ## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure checks for xindy and clisp
 case $with_clisp_runtime in #(
@@ -3995,8 +3987,7 @@ fi
 if test "${enable_web_progs+set}" = set; then :
   enableval=$enable_web_progs;
 fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
 # Check whether --enable-synctex was given.
 if test "${enable_synctex+set}" = set; then :
   enableval=$enable_synctex;
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 367f1485074..d9d3cc9b989 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -709,7 +709,6 @@ enable_xindy
 enable_xindy_rules
 enable_xindy_docs
 with_clisp_runtime
-with_xindy_recode
 enable_xpdfopen
 enable_web2c
 with_banner_add
@@ -1533,7 +1532,7 @@ Optional Features:
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
-  --disable-dump-share      make fmt/base/mem files architecture-dependent
+  --disable-dump-share      make fmt/base files architecture-dependent
   --disable-ipc             disable TeX's --ipc option, i.e., pipe to a
                             program
   --disable-tex             do not compile and install TeX
@@ -1570,7 +1569,7 @@ Optional Features:
   --enable-tektronixwin       include Tektronix window support
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --disable-synctex         do not build the SyncTeX tool
+  --disable-synctex         do not build the SyncTeX library and tool
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex-x      do not build the bibtex-x package
   --disable-bibtex8         do not build the bibtex8 program
@@ -1650,8 +1649,6 @@ Optional Packages:
                           pathname of clisp runtime to install for `xindy',
                           `default' to derive from clisp, or `system' to use
                           installed version
-  --with-xindy-recode     use `recode' instead of `iconv' to build xindy
-                          [default: no]
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
@@ -3598,11 +3595,6 @@ if test "${with_clisp_runtime+set}" = set; then :
   withval=$with_clisp_runtime;
 fi
 
-# Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then :
-  withval=$with_xindy_recode;
-fi
-
 ## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure checks for xindy and clisp
 case $with_clisp_runtime in #(
@@ -4005,8 +3997,7 @@ fi
 if test "${enable_web_progs+set}" = set; then :
   enableval=$enable_web_progs;
 fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
 # Check whether --enable-synctex was given.
 if test "${enable_synctex+set}" = set; then :
   enableval=$enable_synctex;
diff --git a/Build/source/texk/musixtnt/ChangeLog b/Build/source/texk/musixtnt/ChangeLog
index 7be82d5ac3a..47597fdb5a1 100644
--- a/Build/source/texk/musixtnt/ChangeLog
+++ b/Build/source/texk/musixtnt/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Better handling of distributed tests.
+	* fixmsxpart.test, msxlint.test: Removed.
+
 2015-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../../am/dist_hook.am.
diff --git a/Build/source/texk/musixtnt/Makefile.am b/Build/source/texk/musixtnt/Makefile.am
index 091edc28a0e..39f5b004b77 100644
--- a/Build/source/texk/musixtnt/Makefile.am
+++ b/Build/source/texk/musixtnt/Makefile.am
@@ -41,9 +41,8 @@ dist_man_MANS = \
 
 ## Tests
 ##
-TESTS = fixmsxpart.test msxlint.test
-EXTRA_DIST += $(TESTS)
-
-TESTS_ENVIRONMENT = MUSIXTNT_TREE=$(MUSIXTNT_TREE)
+TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"
+TESTS = $(MUSIXTNT_TREE)/fixmsxpart.test $(MUSIXTNT_TREE)/msxlint.test
 DISTCLEANFILES = fixtest.* linttest.*
+NEVER_DIST += $(TESTS:.test=.log) $(TESTS:.test=.trs)
 
diff --git a/Build/source/texk/musixtnt/Makefile.in b/Build/source/texk/musixtnt/Makefile.in
index bb635bed72a..3e268a6d34b 100644
--- a/Build/source/texk/musixtnt/Makefile.in
+++ b/Build/source/texk/musixtnt/Makefile.in
@@ -549,8 +549,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(MUSIXTNT_TREE) $(MUSIXTNT_TREE)-PATCHES $(TESTS)
-NEVER_DIST = `find . $(NEVER_NAMES)`
+EXTRA_DIST = $(MUSIXTNT_TREE) $(MUSIXTNT_TREE)-PATCHES
+NEVER_DIST = `find . $(NEVER_NAMES)` $(TESTS:.test=.log) \
+	$(TESTS:.test=.trs)
 
 # Files not to be distributed
 NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB)
@@ -571,8 +572,8 @@ dist_man_MANS = \
 	$(MUSIXTNT_TREE)/fixmsxpart.1 \
 	$(MUSIXTNT_TREE)/msxlint.1
 
-TESTS = fixmsxpart.test msxlint.test
-TESTS_ENVIRONMENT = MUSIXTNT_TREE=$(MUSIXTNT_TREE)
+TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"
+TESTS = $(MUSIXTNT_TREE)/fixmsxpart.test $(MUSIXTNT_TREE)/msxlint.test
 DISTCLEANFILES = fixtest.* linttest.*
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/musixtnt/fixmsxpart.test b/Build/source/texk/musixtnt/fixmsxpart.test
deleted file mode 100755
index a235c0737f3..00000000000
--- a/Build/source/texk/musixtnt/fixmsxpart.test
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
-# You may freely use, modify and/or distribute this file.
-
-testsrc="$srcdir/$MUSIXTNT_TREE/tests"
-
-. $srcdir/$MUSIXTNT_TREE/`basename $0`
-
diff --git a/Build/source/texk/musixtnt/msxlint.test b/Build/source/texk/musixtnt/msxlint.test
deleted file mode 100755
index a235c0737f3..00000000000
--- a/Build/source/texk/musixtnt/msxlint.test
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
-# You may freely use, modify and/or distribute this file.
-
-testsrc="$srcdir/$MUSIXTNT_TREE/tests"
-
-. $srcdir/$MUSIXTNT_TREE/`basename $0`
-
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 0bd292172d4..53249af1171 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ac/web2c.ac: Update some help texts.
+
 2015-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../../am/dist_hook.am.
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 20b8085be97..e840ba8c6b1 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -1,6 +1,6 @@
 ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 dnl
-dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options for TeX and MF
@@ -18,7 +18,7 @@ AC_ARG_ENABLE([auto-core],
                              kpse_indent_26))[]dnl
 AC_ARG_ENABLE([dump-share],
               AS_HELP_STRING([--disable-dump-share],
-                             [make fmt/base/mem files architecture-dependent],
+                             [make fmt/base files architecture-dependent],
                              kpse_indent_26))[]dnl
 ## configure options for TeX
 AC_ARG_ENABLE([ipc],
@@ -75,10 +75,9 @@ AC_ARG_ENABLE([web-progs],
               AS_HELP_STRING([--disable-web-progs],
                              [do not build WEB programs bibtex ... weave],
                              kpse_indent_26))[]dnl
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
 AC_ARG_ENABLE([synctex],
               AS_HELP_STRING([--disable-synctex],
-                             [do not build the SyncTeX tool],
+                             [do not build the SyncTeX library and tool],
                              kpse_indent_26))[]dnl
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 7b3d754574e..6600a964776 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1706,7 +1706,7 @@ Optional Features:
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
   --enable-auto-core      cause TeX&MF to dump core, given a certain filename
-  --disable-dump-share    make fmt/base/mem files architecture-dependent
+  --disable-dump-share    make fmt/base files architecture-dependent
   --disable-ipc           disable TeX's --ipc option, i.e., pipe to a program
   --disable-tex           do not compile and install TeX
   --enable-tex-synctex      build TeX with SyncTeX support
@@ -1742,7 +1742,7 @@ Optional Features:
   --enable-tektronixwin     include Tektronix window support
   --enable-unitermwin       include Uniterm window support
   --disable-web-progs     do not build WEB programs bibtex ... weave
-  --disable-synctex       do not build the SyncTeX tool
+  --disable-synctex       do not build the SyncTeX library and tool
   --disable-missing       terminate if a requested program or feature must be
                           disabled, e.g., due to missing libraries
 
@@ -18895,8 +18895,7 @@ fi
 if test "${enable_web_progs+set}" = set; then :
   enableval=$enable_web_progs;
 fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
 # Check whether --enable-synctex was given.
 if test "${enable_synctex+set}" = set; then :
   enableval=$enable_synctex;
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 83aa56bd754..6e815cf8dbe 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -709,7 +709,6 @@ enable_xindy
 enable_xindy_rules
 enable_xindy_docs
 with_clisp_runtime
-with_xindy_recode
 enable_xpdfopen
 enable_web2c
 with_banner_add
@@ -1515,7 +1514,7 @@ Optional Features:
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
-  --disable-dump-share      make fmt/base/mem files architecture-dependent
+  --disable-dump-share      make fmt/base files architecture-dependent
   --disable-ipc             disable TeX's --ipc option, i.e., pipe to a
                             program
   --disable-tex             do not compile and install TeX
@@ -1552,7 +1551,7 @@ Optional Features:
   --enable-tektronixwin       include Tektronix window support
   --enable-unitermwin         include Uniterm window support
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --disable-synctex         do not build the SyncTeX tool
+  --disable-synctex         do not build the SyncTeX library and tool
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex-x      do not build the bibtex-x package
   --disable-bibtex8         do not build the bibtex8 program
@@ -1632,8 +1631,6 @@ Optional Packages:
                           pathname of clisp runtime to install for `xindy',
                           `default' to derive from clisp, or `system' to use
                           installed version
-  --with-xindy-recode     use `recode' instead of `iconv' to build xindy
-                          [default: no]
   --with-banner-add=STR   add STR to version string appended to banner lines
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d '%s'] or
                           [texworks --position=%d "%s"]
@@ -3580,11 +3577,6 @@ if test "${with_clisp_runtime+set}" = set; then :
   withval=$with_clisp_runtime;
 fi
 
-# Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then :
-  withval=$with_xindy_recode;
-fi
-
 ## utils/xindy/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 ## configure checks for xindy and clisp
 case $with_clisp_runtime in #(
@@ -3987,8 +3979,7 @@ fi
 if test "${enable_web_progs+set}" = set; then :
   enableval=$enable_web_progs;
 fi
-
-## configure option for the SyncTeX tool
+## configure option for the SyncTeX library and tool
 # Check whether --enable-synctex was given.
 if test "${enable_synctex+set}" = set; then :
   enableval=$enable_synctex;
diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index ecfcdee55a9..6962e2e7f33 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ac/xindy.ac: Drop the obsolete '--with-xindy-recode'.
+
 2015-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../../am/dist_hook.am.
diff --git a/Build/source/utils/xindy/ac/xindy.ac b/Build/source/utils/xindy/ac/xindy.ac
index a24f9b86895..3aaedcd52a6 100644
--- a/Build/source/utils/xindy/ac/xindy.ac
+++ b/Build/source/utils/xindy/ac/xindy.ac
@@ -1,6 +1,6 @@
 ## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
 dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options for xindy
@@ -17,6 +17,3 @@ AC_ARG_WITH([clisp-runtime],
             AS_HELP_STRING([--with-clisp-runtime=PATH],
                            [pathname of clisp runtime to install for `xindy', `default' to derive
                             from clisp, or `system' to use installed version]))[]dnl
-AC_ARG_WITH([xindy-recode],
-            AS_HELP_STRING([--with-xindy-recode],
-                           [use `recode' instead of `iconv' to build xindy @<:@default: no@:>@]))[]dnl
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 44dd86eb373..c40c4391037 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -719,7 +719,6 @@ enable_compiler_warnings
 enable_xindy_rules
 enable_xindy_docs
 with_clisp_runtime
-with_xindy_recode
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1373,8 +1372,6 @@ Optional Packages:
                           pathname of clisp runtime to install for `xindy',
                           `default' to derive from clisp, or `system' to use
                           installed version
-  --with-xindy-recode     use `recode' instead of `iconv' to build xindy
-                          [default: no]
 
 Some influential environment variables:
   CC          C compiler command
@@ -3754,11 +3751,6 @@ if test "${with_clisp_runtime+set}" = set; then :
   withval=$with_clisp_runtime;
 fi
 
-# Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then :
-  withval=$with_xindy_recode;
-fi
-
 
 case $enable_xindy_rules in #(
   yes | no) :