build system: more utils/xindy/ and general cleanup

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

20 files changed, 49 insertions, 15 deletions

diff --git a/Build/source/libs/Makefile.am b/Build/source/libs/Makefile.am
index 65dfd053e1c..1192ea05dcd 100644
--- a/Build/source/libs/Makefile.am
+++ b/Build/source/libs/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../m4 --force
 SUBDIRS = dummy . $(SUBLIBS)
 DIST_SUBDIRS = dummy $(DIST_SUBLIBS)
 
-## just in case a subdirectory has added directories
+# just in case a subdirectory has added directories
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index dc0f91eda21..ece65574077 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -70,6 +70,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \
 	$(top_srcdir)/../utils/vlna/ac/withenable.ac \
 	$(top_srcdir)/../utils/xindy/ac/withenable.ac \
+	$(top_srcdir)/../utils/xindy/ac/xindy.ac \
 	$(top_srcdir)/../texk/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
@@ -664,6 +665,7 @@ uninstall-am:
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
+# just in case a subdirectory has added directories
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 5470c90c226..fb01ecf76b1 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -693,6 +693,9 @@ enable_t1utils
 enable_tpic2pdftex
 enable_vlna
 enable_xindy
+enable_xindy_make_rules
+enable_xindy_docs
+with_xindy_recode
 enable_web2c
 with_editor
 enable_auto_core
@@ -1456,6 +1459,9 @@ Optional Features:
   --disable-tpic2pdftex   do not build the tpic2pdftex package
   --disable-vlna          do not build the vlna package
   --enable-xindy          build the xindy package
+  --enable-xindy-make-rules build and install make-rules package (default is
+                            YES)
+  --enable-xindy-docs       build and install documentation (default is YES)
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
@@ -1540,6 +1546,8 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-xindy-recode     For `xindy': use `recode' instead of `iconv'
+                          (default is NO)
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d %s]
   --without-mf-x-toolkit  do not use X toolkit for METAFONT
   --with-gs=/PATH/TO/gs   Hard-wire the location of GhostScript
@@ -2334,6 +2342,22 @@ $as_echo "$as_me: Assuming \`--enable-xindy=$enable_xindy'" >&6;}
      ac_configure_args="$ac_configure_args '--enable-xindy=$enable_xindy'";;
 esac
 
+## utils/xindy/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
+## configure options for xindy
+# Check whether --enable-xindy-make-rules was given.
+if test "${enable_xindy_make_rules+set}" = set; then
+  enableval=$enable_xindy_make_rules;
+fi
+# Check whether --enable-xindy-docs was given.
+if test "${enable_xindy_docs+set}" = set; then
+  enableval=$enable_xindy_docs;
+fi
+
+# Check whether --with-xindy-recode was given.
+if test "${with_xindy_recode+set}" = set; then
+  withval=$with_xindy_recode;
+fi
+
 
 
 ## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index 5b043bd13a4..f6d597bc622 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## Thus nodist_* for all files in $(GD_TREE).
 EXTRA_DIST = $(GD_TREE)
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(GD_TREE) -name .svn`
 
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index f9b9ea79940..13b3c3c4fe3 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -1034,6 +1034,7 @@ uninstall-am:
 	uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(GD_TREE) -name .svn`
 
diff --git a/Build/source/libs/graphite/Makefile.am b/Build/source/libs/graphite/Makefile.am
index 6227f6e5b18..e0b04f74115 100644
--- a/Build/source/libs/graphite/Makefile.am
+++ b/Build/source/libs/graphite/Makefile.am
@@ -47,7 +47,7 @@ EXTRA_DIST = \
 	test \
 	uninstalled-top.pc.in
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
diff --git a/Build/source/libs/graphite/Makefile.in b/Build/source/libs/graphite/Makefile.in
index 5a03fa55921..e48b277315e 100644
--- a/Build/source/libs/graphite/Makefile.in
+++ b/Build/source/libs/graphite/Makefile.in
@@ -1051,6 +1051,7 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index 1798c7ba48d..9d870eef8e7 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS = dummy
 ## We want to re-distribute the whole icu-xetex source tree.
 EXTRA_DIST = icu-xetex
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/icu-xetex -name .svn`
 
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index bae16bceb23..4931a6d39a7 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -578,6 +578,7 @@ uninstall-am:
 	uninstall uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/icu-xetex -name .svn`
 
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index e6215891fa6..d795ef6a264 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## Thus nodist_* for all files in $(LIBPNG_TREE).
 EXTRA_DIST = $(LIBPNG_TREE)
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn`
 
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index 1403f5ddbc2..52fc9fe8ca2 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -927,6 +927,7 @@ uninstall-am:
 	uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn`
 
diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am
index 28f158968c8..59202599135 100644
--- a/Build/source/libs/t1lib/Makefile.am
+++ b/Build/source/libs/t1lib/Makefile.am
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## Thus nodist_* for all files in $(T1LIB_TREE).
 EXTRA_DIST = $(T1LIB_TREE)
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(T1LIB_TREE) -name .svn`
 
diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in
index 569b9351530..496b390b13e 100644
--- a/Build/source/libs/t1lib/Makefile.in
+++ b/Build/source/libs/t1lib/Makefile.in
@@ -1177,6 +1177,7 @@ uninstall-am:
 	uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(T1LIB_TREE) -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index 84b1ed618e5..95b12a7206f 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -80,7 +80,7 @@ EXTRA_DIST += \
 	source/version_defs.h \
 	test
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index d12f9c33853..80c96feb85d 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -646,6 +646,7 @@ uninstall-am:
 
 @ZLIB_RULE@
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 7374496dcbf..ea12b331bdc 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST +=  $(XPDF_TREE)-foolabs
 ##
 EXTRA_DIST +=  $(XPDF_TREE)-PATCHES
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(XPDF_TREE) -name .svn`
 
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index c6aa37dcb8b..8fd073a30d4 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -1454,6 +1454,7 @@ uninstall-am:
 	uninstall uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(XPDF_TREE) -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/xpdf/configure.ac b/Build/source/libs/xpdf/configure.ac
index 24d82ee2e45..a69e33b4d24 100644
--- a/Build/source/libs/xpdf/configure.ac
+++ b/Build/source/libs/xpdf/configure.ac
@@ -18,24 +18,24 @@ AM_MAINTAINER_MODE
 
 dnl ##### Optional features.
 AC_ARG_ENABLE([a4-paper],
-              [AS_HELP_STRING([--enable-a4-paper],
-                              [use A4 paper size instead of Letter for PostScript output])],
+              AS_HELP_STRING([--enable-a4-paper],
+                             [use A4 paper size instead of Letter for PostScript output]),
               [if test "x$enableval" = xyes; then
 AC_DEFINE([A4_PAPER], 1, [Use A4 paper size instead of Letter for PostScript output])
 fi
 ])
 
 AC_ARG_ENABLE([opi],
-              [AS_HELP_STRING([--enable-opi],
-                              [include support for OPI comments])],
+              AS_HELP_STRING([--enable-opi],
+                             [include support for OPI comments]),
               [if test "x$enableval" = xyes; then
 AC_DEFINE([OPI_SUPPORT], 1, [Include support for OPI comments])
 fi
 ])
 
 AC_ARG_ENABLE([multithreaded],
-              [AS_HELP_STRING([--enable-multithreaded],
-                              [include support for multithreading])],
+              AS_HELP_STRING([--enable-multithreaded],
+                             [include support for multithreading]),
               [if test "x$enableval" = xyes; then
 AC_DEFINE([MULTITHREADED], 1, [Enable multithreading support])
 fi
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 6f188a23e3d..80dbb8b81a8 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## Thus nodist_* for all files in $(ZLIB_TREE).
 EXTRA_DIST = $(ZLIB_TREE)
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn`
 
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 9e87426ff21..569152b8d20 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -903,6 +903,7 @@ uninstall-am:
 	uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn`