build system: more utils/xindy/ and general cleanup

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

18 files changed, 86 insertions, 36 deletions

diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am
index efa524ba3df..1345991963f 100644
--- a/Build/source/texk/Makefile.am
+++ b/Build/source/texk/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../m4 --force
 SUBDIRS = dummy . $(SUBTEXK)
 DIST_SUBDIRS = dummy $(DIST_SUBTEXK)
 
-## 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/texk/Makefile.in b/Build/source/texk/Makefile.in
index ae50a8712f9..869650da7ce 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/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/texk/configure b/Build/source/texk/configure
index 45bed7cef18..9b24285ab9d 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/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
@@ -1475,6 +1478,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
@@ -1559,6 +1565,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
@@ -2353,6 +2361,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/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index e7cbc877b46..72be72578e8 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -18218,6 +18218,10 @@ if test "x$with_system_freetype2" = xyes; then
   if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
+  { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5
+$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
   FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index d0870155c1d..b2a9c1943d1 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -55,8 +55,8 @@ test -d $srcdir/../kpathsea && enable_tetex_build=yes
 AM_CONDITIONAL([tetex_build], [test "x$enable_tetex_build" = xyes])
 
 AC_ARG_WITH([kpathsea],
-            [AS_HELP_STRING([--without-kpathsea],
-                            [build otftotfm without kpathsea])])
+            AS_HELP_STRING([--without-kpathsea],
+                           [build otftotfm without kpathsea]))
 
 KPSE_KPATHSEA_FLAGS
 
diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index b71663fcf50..183a4ca8e02 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -34,7 +34,7 @@ tex4ht_subdir = texmf-dist/scripts/tex4ht
 tex4htdir = ${prefix}/$(tex4ht_subdir)
 tex4ht_SCRIPTS =
 
-## We support both multiplatform and non-multiplatform builds.
+# We support both multiplatform and non-multiplatform builds.
 install-data-hook:
 	@for p in $(perl_scripts); do \
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \
@@ -197,7 +197,7 @@ EXTRA_DIST += \
 	xhxetex \
 	xv4ht.java
 
-## 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/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index 4e868e06f51..781bcee3a54 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -719,6 +719,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 @KPATHSEA_RULE@
 
+# We support both multiplatform and non-multiplatform builds.
 install-data-hook:
 	@for p in $(perl_scripts); do \
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \
@@ -759,6 +760,7 @@ uninstall-hook:
 	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
 	done
 
+# 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/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am
index 976e0a634a0..77c0d300f22 100644
--- a/Build/source/texk/ttf2pk/Makefile.am
+++ b/Build/source/texk/ttf2pk/Makefile.am
@@ -89,7 +89,7 @@ EXTRA_DIST = \
 	emtexdir.h \
 	ttf2pk.doc
 
-## 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/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in
index 79e9ebe8cb8..53637f15c30 100644
--- a/Build/source/texk/ttf2pk/Makefile.in
+++ b/Build/source/texk/ttf2pk/Makefile.in
@@ -774,6 +774,7 @@ uninstall-man: uninstall-man1
 @KPATHSEA_RULE@
 @FREETYPE_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/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am
index 1ef783e547d..fe6b13949ca 100644
--- a/Build/source/texk/ttfdump/Makefile.am
+++ b/Build/source/texk/ttfdump/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## DISTFILES contains a directory and files in that directory.
 EXTRA_DIST = docs include libttf src
 
-## 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/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in
index e9bfcc22d60..d027a5cb0cd 100644
--- a/Build/source/texk/ttfdump/Makefile.in
+++ b/Build/source/texk/ttfdump/Makefile.in
@@ -1212,6 +1212,7 @@ uninstall-man: uninstall-man1
 	uninstall-man uninstall-man1
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 3e84dbd0bc6..812205a18e9 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h
 DISTCLEANFILES = $(EXTRA_LIBRARIES)
 CLEANFILES =
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
@@ -58,11 +58,11 @@ LDADD = $(proglib) $(KPATHSEA_LIBS)
 ## This does not work for the configure substitution  $(KPATHSEA_LIBS),
 ## thus we let $(proglib) artificially depend on $(KPATHSEA_LIBS).
 
-## Rebuild $(proglib)
+# Rebuild $(proglib)
 $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
 	cd lib && $(MAKE) $(AM_MAKEFLAGS)
 
-## Rebuild Web2C programs
+# Rebuild Web2C programs
 web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
 	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
 web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 8d9f5959f81..70dc2e6245c 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -7862,12 +7862,15 @@ uninstall-man: uninstall-man1 uninstall-man5
 	uninstall-man5
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
+# Rebuild $(proglib)
 $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
 	cd lib && $(MAKE) $(AM_MAKEFLAGS)
 
+# Rebuild Web2C programs
 web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
 	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
 web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 94ee84f2095..2080c3bce68 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -6,21 +6,21 @@ dnl
 ## configure options for TeX and MF
 m4_define_default([kpse_indent_26], [26])[]dnl
 AC_ARG_WITH([editor],
-            [AS_HELP_STRING([--with-editor=CMD],
-                            [invoke CMD from the `e' option @<:@vi +%d %s@:>@])])[]dnl
+            AS_HELP_STRING([--with-editor=CMD],
+                           [invoke CMD from the `e' option @<:@vi +%d %s@:>@]))[]dnl
 AC_ARG_ENABLE([auto-core],
-              [AS_HELP_STRING([--enable-auto-core],
-                              [cause TeX&MF to dump core, given a certain filename],
-                              kpse_indent_26)])[]dnl
+              AS_HELP_STRING([--enable-auto-core],
+                             [cause TeX&MF to dump core, given a certain filename],
+                             kpse_indent_26))[]dnl
 AC_ARG_ENABLE([dump-share],
-              [AS_HELP_STRING([--disable-dump-share],
-                              [make fmt/base/mem files architecture-dependent],
-                              kpse_indent_26)])[]dnl
+              AS_HELP_STRING([--disable-dump-share],
+                             [make fmt/base/mem files architecture-dependent],
+                             kpse_indent_26))[]dnl
 ## configure options for TeX
 AC_ARG_ENABLE([ipc],
-              [AS_HELP_STRING([--enable-ipc],
-                              [enable TeX's --ipc option, i.e., pipe to a program],
-                              kpse_indent_26)])[]dnl
+              AS_HELP_STRING([--enable-ipc],
+                             [enable TeX's --ipc option, i.e., pipe to a program],
+                             kpse_indent_26))[]dnl
 m4_define([kpse_tex_progs], [dnl
 [[tex],    [yes], [no],  [TeX],    []],
 [[etex],   [no],  [yes], [e-TeX],  []],
@@ -34,16 +34,16 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs],
                      [KPSE_WITH_XTEX(Kpse_Prog)])])[]dnl
 ## configure options for MF
 AC_ARG_ENABLE([mf],
-              [AS_HELP_STRING([--disable-mf],
-                              [do not build METAFONT],
-                              kpse_indent_26)])[]dnl
+              AS_HELP_STRING([--disable-mf],
+                             [do not build METAFONT],
+                             kpse_indent_26))[]dnl
 AC_ARG_ENABLE([mf-nowin],
-              [AS_HELP_STRING([--disable-mf-nowin],
-                              [do not build a separate non-windows-capable METAFONT],
-                              kpse_indent_26+2)])[]dnl
+              AS_HELP_STRING([--disable-mf-nowin],
+                             [do not build a separate non-windows-capable METAFONT],
+                             kpse_indent_26+2))[]dnl
 AC_ARG_WITH([mf-x-toolkit],
-            [AS_HELP_STRING([--without-mf-x-toolkit],
-                            [do not use X toolkit for METAFONT])])[]dnl
+            AS_HELP_STRING([--without-mf-x-toolkit],
+                           [do not use X toolkit for METAFONT]))[]dnl
 m4_define([kpse_mf_win], [dnl
 [[epsf],      [EPSF],      [EPSF pseudo]],
 [[hp2627],    [HP2627],    [HP 2627]],
@@ -59,11 +59,11 @@ m4_foreach([Kpse_Win], [kpse_mf_win],
                      [KPSE_WITH_MFWIN(Kpse_Win)])])[]dnl
 ## configure options for MP
 AC_ARG_ENABLE([mp],
-              [AS_HELP_STRING([--disable-mp],
-                              [do not build METAPOST],
-                              kpse_indent_26)])[]dnl
+              AS_HELP_STRING([--disable-mp],
+                             [do not build METAPOST],
+                             kpse_indent_26))[]dnl
 ## configure options for WEB programs
 AC_ARG_ENABLE([web-progs],
-              [AS_HELP_STRING([--disable-web-progs],
-                              [do not build WEB programs bibtex ... weave],
-                              kpse_indent_26)])[]dnl
+              AS_HELP_STRING([--disable-web-progs],
+                             [do not build WEB programs bibtex ... weave],
+                             kpse_indent_26))[]dnl
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 3544d4fff66..755e37e5b24 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -23756,6 +23756,10 @@ if test "x$with_system_xpdf" = xyes; then
   POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
+elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
+  { { $as_echo "$as_me:$LINENO: error: did not find poppler-0.10 or better" >&5
+$as_echo "$as_me: error: did not find poppler-0.10 or better" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
   XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \
@@ -23913,6 +23917,10 @@ if test "x$with_system_freetype2" = xyes; then
   if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
+  { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5
+$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
   FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \
diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am
index e064309bd63..74acde13f6b 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = \
 	style_ie.css \
 	style_plain.css
 
-## 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/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in
index 8d9f36da05f..2a7471efae6 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/Makefile.in
@@ -673,6 +673,7 @@ uninstall-am:
 	ps ps-am tags tags-recursive 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/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 0e3d1a6c10f..55bf19800d8 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -17449,6 +17449,10 @@ if test "x$with_system_freetype2" = xyes; then
   if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
+  { { $as_echo "$as_me:$LINENO: error: did not find freetype-config required for system freetype2 library" >&5
+$as_echo "$as_me: error: did not find freetype-config required for system freetype2 library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
   FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \