build system: cleanup xindy, remove some unused files

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

79 files changed, 366 insertions, 670 deletions

diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am
index 7786c13bb99..33d6ca77614 100644
--- a/Build/source/utils/Makefile.am
+++ b/Build/source/utils/Makefile.am
@@ -22,13 +22,13 @@ DISTCLEANFILES = $(noinst_DATA)
 all-local: subutils
 
 .PHONY: subutils
-## We must configure all utils subdirs since 'make dist' needs the Makefile.
-## For those not required for the current set of configure options
-## we append '--disable-build' so they can skip tests that would
-## fail because, e.g., some libraries were not built.
-
-## Sequentially configure and optionally build all utils subdirs;
-## code inspired by automake's way to handle recursive targets.
+# We must configure all utils subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+#
+# Sequentially configure and optionally build all utils subdirs;
+# code inspired by automake's way to handle recursive targets.
 subutils: $(noinst_DATA)
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index be6b8bc10e4..f9edecacc1a 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -672,7 +672,13 @@ dist-hook:
 all-local: subutils
 
 .PHONY: subutils
-
+# We must configure all utils subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+#
+# Sequentially configure and optionally build all utils subdirs;
+# code inspired by automake's way to handle recursive targets.
 subutils: $(noinst_DATA)
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 6721948e0d8..4b11578b530 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -693,7 +693,7 @@ enable_t1utils
 enable_tpic2pdftex
 enable_vlna
 enable_xindy
-enable_xindy_make_rules
+enable_xindy_rules
 enable_xindy_docs
 with_xindy_recode
 enable_web2c
@@ -1456,9 +1456,8 @@ 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)
+  --enable-xindy-rules      build and install make-rules package
+  --enable-xindy-docs       build and install documentation
   --disable-web2c         do not build the web2c (TeX & Co.) package
   --enable-auto-core        cause TeX&MF to dump core, given a certain
                             filename
@@ -2341,9 +2340,9 @@ 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;
+# Check whether --enable-xindy-rules was given.
+if test "${enable_xindy_rules+set}" = set; then
+  enableval=$enable_xindy_rules;
 fi
 # Check whether --enable-xindy-docs was given.
 if test "${enable_xindy_docs+set}" = set; then
diff --git a/Build/source/utils/xindy/ChangeLog.TL b/Build/source/utils/xindy/ChangeLog.TL
index 04579f239f7..1ab09c5e330 100644
--- a/Build/source/utils/xindy/ChangeLog.TL
+++ b/Build/source/utils/xindy/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: Changes for xindy (teTeX / TeX Live)
 ======================================================
 
+2009-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac, ac/xindy.ac: Reorganize for dual use:
+	xindy in TL and standalone xindy. Adjust enable/disable.
+
 2009-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Check for PERL, LATEX, and PDFLATEX.
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 5fde691c17b..8113a9dd774 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -47,10 +47,8 @@ DIST_COMMON = $(am__configure_deps) \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \
 	COPYING INSTALL NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -102,6 +100,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -177,7 +176,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -186,7 +184,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/ac/xindy.ac b/Build/source/utils/xindy/ac/xindy.ac
index 137572739a4..8ea4ad6fa61 100644
--- a/Build/source/utils/xindy/ac/xindy.ac
+++ b/Build/source/utils/xindy/ac/xindy.ac
@@ -5,13 +5,13 @@ dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options for xindy
 m4_define_default([kpse_indent_26], [26])[]dnl
-AC_ARG_ENABLE([xindy-make-rules],
-              AS_HELP_STRING([--enable-xindy-make-rules],
-                             [build and install make-rules package (default is YES)],
+AC_ARG_ENABLE([xindy-rules],
+              AS_HELP_STRING([--enable-xindy-rules],
+                             [build and install make-rules package],
                              kpse_indent_26))[]dnl
 AC_ARG_ENABLE([xindy-docs],
               AS_HELP_STRING([--enable-xindy-docs],
-                             [build and install documentation (default is YES)],
+                             [build and install documentation],
                              kpse_indent_26))[]dnl
 AC_ARG_WITH([xindy-recode],
             AS_HELP_STRING([--with-xindy-recode],
diff --git a/Build/source/utils/xindy/aclocal.m4 b/Build/source/utils/xindy/aclocal.m4
index 77fa274f068..42b922052dc 100644
--- a/Build/source/utils/xindy/aclocal.m4
+++ b/Build/source/utils/xindy/aclocal.m4
@@ -925,6 +925,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ac_prog_latex.m4])
-m4_include([m4/ac_prog_pdflatex.m4])
 m4_include([m4/tl_msg_error.m4])
diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in
index 63e7e2ac57c..b0d82bedab3 100644
--- a/Build/source/utils/xindy/binaries/Makefile.in
+++ b/Build/source/utils/xindy/binaries/Makefile.in
@@ -36,10 +36,8 @@ host_triplet = @host@
 subdir = binaries
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -68,6 +66,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -143,7 +142,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -152,7 +150,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 4d1a86c439e..b8fe03ebfa1 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -655,10 +655,8 @@ CLISP_LIB
 CLISP
 BUILDDOCS_FALSE
 BUILDDOCS_TRUE
-pdflatex
 BUILDRULES_FALSE
 BUILDRULES_TRUE
-latex
 TETEX_BUILD_FALSE
 TETEX_BUILD_TRUE
 CONVERT_FROM_UTF8
@@ -752,7 +750,7 @@ ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
 enable_dependency_tracking
-enable_xindy_make_rules
+enable_xindy_rules
 enable_xindy_docs
 with_xindy_recode
 '
@@ -1399,10 +1397,8 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-xindy-make-rules
-                          build and install make-rules package (default is
-                          YES)
-  --enable-xindy-docs     build and install documentation (default is YES)
+  --enable-xindy-rules    build and install make-rules package
+  --enable-xindy-docs     build and install documentation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1900,6 +1896,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+
 am__api_version='1.10'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3957,12 +3954,14 @@ done
 test -n "$PDFLATEX" || PDFLATEX="no"
 
 
-# Include onfigure options that also appear at the top-level of the TL tree.
+{ $as_echo "$as_me:$LINENO: Configuring xindy as part of the TeX Live tree" >&5
+$as_echo "$as_me: Configuring xindy as part of the TeX Live tree" >&6;}
+# Include configure options that also appear at the top-level of the TL tree.
 ## 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;
+# Check whether --enable-xindy-rules was given.
+if test "${enable_xindy_rules+set}" = set; then
+  enableval=$enable_xindy_rules;
 fi
 # Check whether --enable-xindy-docs was given.
 if test "${enable_xindy_docs+set}" = set; then
@@ -3974,8 +3973,11 @@ if test "${with_xindy_recode+set}" = set; then
   withval=$with_xindy_recode;
 fi
 
+test "x$enable_xindy_rules" = xyes || enable_xindy_rules=no
+test "x$enable_xindy_docs" = xyes || enable_xindy_docs=no
+
 
-# This option haqs been renamed --enable-native-texlive-build
+# This option has been renamed --enable-native-texlive-build
 # but should only be inherited and not specified here
 # AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation]))
 
@@ -4034,17 +4036,6 @@ $as_echo "$as_me: Using installation layout for TeX Live" >&6;}
   datadir="$prefix/texmf"
   docdir="$prefix/texmf/doc/$PACKAGE_NAME"
   mandir="$prefix/texmf/doc/man"
-  if test -z "$enable_xindy_docs"; then
-    { $as_echo "$as_me:$LINENO: Disabling docs building" >&5
-$as_echo "$as_me: Disabling docs building" >&6;}
-    enable_xindy_docs=no;
-  fi
-#  if test -z "$enable_xindy_make_rules"; then
-#    AC_MSG_NOTICE([Disabling make-rules building])
-#    enable_xindy_make_rules=no;
-#  fi
-else
-  enable_native_texlive_build=no
 fi
  if test "x$enable_native_texlive_build" = xyes; then
   TETEX_BUILD_TRUE=
@@ -4055,143 +4046,58 @@ else
 fi
 
 
-if test "x$enable_xindy_make_rules" != xno; then
-
-for ac_prog in latex elatex lambda
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_latex+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$latex"; then
-  ac_cv_prog_latex="$latex" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_latex="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-latex=$ac_cv_prog_latex
-if test -n "$latex"; then
-  { $as_echo "$as_me:$LINENO: result: $latex" >&5
-$as_echo "$latex" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$latex" && break
-done
-test -n "$latex" || latex="no"
-
-export latex;
-if test $latex = "no" ;
-then
-	if test "x$enable_build" = xno; then
+if test "x$enable_xindy_rules" != xno; then
+  if text "x$PERL" = xno; then
+    if test "x$enable_build" = xno; then
   { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because
-Unable to find a LaTeX application" >&5
+Unable to find a Perl application, required to build rules" >&5
 $as_echo "$as_me: WARNING: building xindy has been disabled and would fail because
-Unable to find a LaTeX application" >&2;}
+Unable to find a Perl application, required to build rules" >&2;}
 else
-  { { $as_echo "$as_me:$LINENO: error: Unable to find a LaTeX application" >&5
-$as_echo "$as_me: error: Unable to find a LaTeX application" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Unable to find a Perl application, required to build rules" >&5
+$as_echo "$as_me: error: Unable to find a Perl application, required to build rules" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-fi
-
-
-fi
-
- if test "x$enable_xindy_make_rules" != xno; then
-  BUILDRULES_TRUE=
-  BUILDRULES_FALSE='#'
-else
-  BUILDRULES_TRUE='#'
-  BUILDRULES_FALSE=
-fi
-
-
-if test "x$enable_xindy_docs" != xno; then
-
-for ac_prog in pdflatex
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_pdflatex+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$pdflatex"; then
-  ac_cv_prog_pdflatex="$pdflatex" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_pdflatex="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
   fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-pdflatex=$ac_cv_prog_pdflatex
-if test -n "$pdflatex"; then
-  { $as_echo "$as_me:$LINENO: result: $pdflatex" >&5
-$as_echo "$pdflatex" >&6; }
+  if text "x$LATEX" = xno; then
+    if test "x$enable_build" = xno; then
+  { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because
+Unable to find a LaTeX application, required to build rules" >&5
+$as_echo "$as_me: WARNING: building xindy has been disabled and would fail because
+Unable to find a LaTeX application, required to build rules" >&2;}
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: Unable to find a LaTeX application, required to build rules" >&5
+$as_echo "$as_me: error: Unable to find a LaTeX application, required to build rules" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-  test -n "$pdflatex" && break
-done
-test -n "$pdflatex" || pdflatex="no"
-
-export pdflatex;
-if test $pdflatex = "no" ;
-then
-	if test "x$enable_build" = xno; then
+  fi
+  if test "x$enable_xindy_docs" != xno; then
+    if text "x$PDFLATEX" = xno; then
+      if test "x$enable_build" = xno; then
   { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because
-Unable to find a PDFLaTeX application" >&5
+Unable to find a pdfLaTeX application, required to build rules and docs" >&5
 $as_echo "$as_me: WARNING: building xindy has been disabled and would fail because
-Unable to find a PDFLaTeX application" >&2;}
+Unable to find a pdfLaTeX application, required to build rules and docs" >&2;}
 else
-  { { $as_echo "$as_me:$LINENO: error: Unable to find a PDFLaTeX application" >&5
-$as_echo "$as_me: error: Unable to find a PDFLaTeX application" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Unable to find a pdfLaTeX application, required to build rules and docs" >&5
+$as_echo "$as_me: error: Unable to find a pdfLaTeX application, required to build rules and docs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
+    fi
+  fi
 fi
-
-
+ if test "x$enable_xindy_rules" != xno; then
+  BUILDRULES_TRUE=
+  BUILDRULES_FALSE='#'
+else
+  BUILDRULES_TRUE='#'
+  BUILDRULES_FALSE=
 fi
 
  if test "x$enable_xindy_docs" != xno; then
@@ -4270,7 +4176,8 @@ fi
 else
   { $as_echo "$as_me:$LINENO: checking for clisp library directory" >&5
 $as_echo_n "checking for clisp library directory... " >&6; }
-  CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))'`
+  # Remove trailing slash (ugly) or backslash (harmful substitution).
+  CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))' | sed -e 's,\\/$,,'`
   { $as_echo "$as_me:$LINENO: result: $CLISP_LIB" >&5
 $as_echo "$CLISP_LIB" >&6; }
   test -f "$CLISP_LIB/clisp-link" || if test "x$enable_build" = xno; then
@@ -4312,7 +4219,6 @@ fi
 fi
 
 
-
 if test "x$EXEEXT" = "x.exe"; then
   XINDY_RUN=xindy-lisp.exe
   LISP_RUN=lisp.exe
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 0d745ea6432..5f8b7f8cf91 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -24,9 +24,16 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
+dnl Produce different results for standalone xindy or xindy as part of
+dnl the TeX Live (TL) tree; first distinguish these two cases.
+m4_syscmd([test -f ../../texk/kpathsea/doc/kpathsea.texi])[]dnl
+m4_if(m4_sysval, [0], [m4_define([kpse_TL], [])])[]dnl
+
 AC_PREREQ([2.63])
 AC_INIT([xindy], [2.3], [xindy-discuss@lists.sourceforge.net])
+m4_ifdef([kpse_TL], [dnl For xindy as part of the TL tree
 AC_CONFIG_AUX_DIR([../../build-aux])
+])
 
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -41,10 +48,29 @@ AC_CHECK_PROGS([PERL], [perl], [no])
 AC_CHECK_PROGS([LATEX], [latex elatex lambda], [no])
 AC_CHECK_PROGS([PDFLATEX], [pdflatex], [no])
 
-# Include onfigure options that also appear at the top-level of the TL tree.
-m4_include([ac/xindy.ac])
+m4_ifdef([kpse_TL], [dnl For xindy as part of the TL tree
+AC_MSG_NOTICE([Configuring xindy as part of the TeX Live tree])
+# Include configure options that also appear at the top-level of the TL tree.
+dnl We use m4_sinclude because the standalone version has no such file.
+m4_sinclude([ac/xindy.ac])
+test "x$enable_xindy_rules" = xyes || enable_xindy_rules=no
+test "x$enable_xindy_docs" = xyes || enable_xindy_docs=no
+], [dnl For standalone xindy
+AC_MSG_NOTICE([Configuring standalone xindy])
+AC_ARG_ENABLE([xindy-rules],
+              AS_HELP_STRING([--disable-xindy-rules],
+                             [do not build and install make-rules package]))[]dnl
+AC_ARG_ENABLE([xindy-docs],
+              AS_HELP_STRING([--disable-xindy-docs],
+                             [do not build and install documentation]))[]dnl
+AC_ARG_WITH([xindy-recode],
+            AS_HELP_STRING([--with-xindy-recode],
+                           [Use `recode' instead of `iconv' (default is NO)]))[]dnl
+test "x$enable_xindy_rules" = xno || enable_xindy_rules=yes
+test "x$enable_xindy_docs" = xno || enable_xindy_docs=yes
+])
 
-# This option haqs been renamed --enable-native-texlive-build
+# This option has been renamed --enable-native-texlive-build
 # but should only be inherited and not specified here
 # AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation]))
 
@@ -64,29 +90,23 @@ if test "x$enable_native_texlive_build" = xyes; then
   datadir="$prefix/texmf"
   docdir="$prefix/texmf/doc/$PACKAGE_NAME"
   mandir="$prefix/texmf/doc/man"
-  if test -z "$enable_xindy_docs"; then
-    AC_MSG_NOTICE([Disabling docs building])
-    enable_xindy_docs=no;
-  fi
-#  if test -z "$enable_xindy_make_rules"; then
-#    AC_MSG_NOTICE([Disabling make-rules building])
-#    enable_xindy_make_rules=no;
-#  fi
-else
-  enable_native_texlive_build=no
 fi
 AM_CONDITIONAL([TETEX_BUILD],[test "x$enable_native_texlive_build" = xyes])
 
-if test "x$enable_xindy_make_rules" != xno; then
-    AC_PROG_LATEX
-fi
-
-AM_CONDITIONAL([BUILDRULES], [test "x$enable_xindy_make_rules" != xno])
-
-if test "x$enable_xindy_docs" != xno; then
-    AC_PROG_PDFLATEX
+if test "x$enable_xindy_rules" != xno; then
+  if text "x$PERL" = xno; then
+    TL_MSG_ERROR([Unable to find a Perl application, required to build rules])
+  fi
+  if text "x$LATEX" = xno; then
+    TL_MSG_ERROR([Unable to find a LaTeX application, required to build rules])
+  fi
+  if test "x$enable_xindy_docs" != xno; then
+    if text "x$PDFLATEX" = xno; then
+      TL_MSG_ERROR([Unable to find a pdfLaTeX application, required to build rules and docs])
+    fi
+  fi
 fi
-
+AM_CONDITIONAL([BUILDRULES], [test "x$enable_xindy_rules" != xno])
 AM_CONDITIONAL([BUILDDOCS], [test "x$enable_xindy_docs" != xno])
 
 AC_CHECK_PROGS([CLISP], [clisp], [no])
@@ -96,15 +116,14 @@ Please install clisp or specify the clisp executable location
 via the CLISP=... configure argument.])
 else
   AC_MSG_CHECKING([for clisp library directory])
-  CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))'`
+  # Remove trailing slash (ugly) or backslash (harmful substitution).
+  CLISP_LIB=`$CLISP -q -norc -x '(progn (princ *lib-directory*) (values))' | sed -e 's,[\\/]$,,'`
   AC_MSG_RESULT([$CLISP_LIB])
   test -f "$CLISP_LIB/clisp-link" || TL_MSG_ERROR([clisp is not usable: expected file is not found: $CLISP_LIB/clisp-link])
   test -d "$CLISP_LIB/full" || TL_MSG_ERROR([clisp is not usable: expected directory is not found: $CLISP_LIB/full])
   test -d "$CLISP_LIB/linkkit" || TL_MSG_ERROR([clisp is not usable: expected directory is not found: $CLISP_LIB/linkkit])
 fi
 AC_SUBST(CLISP_LIB)
-dnl CLISP_LIB may end with a backslash (on mingw)
-_AM_SUBST_NOTMAKE(CLISP_LIB)
 
 if test "x$EXEEXT" = "x.exe"; then
   XINDY_RUN=xindy-lisp.exe
diff --git a/Build/source/utils/xindy/doc/Makefile.in b/Build/source/utils/xindy/doc/Makefile.in
index e341b8a235f..b301eb72288 100644
--- a/Build/source/utils/xindy/doc/Makefile.in
+++ b/Build/source/utils/xindy/doc/Makefile.in
@@ -36,10 +36,8 @@ subdir = doc
 DIST_COMMON = README $(dist_noinst_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -78,6 +76,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -153,7 +152,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -162,7 +160,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
index 527cebbf109..8327aca3b6b 100644
--- a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = doc/style-tutorial
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/m4/ac_prog_latex.m4 b/Build/source/utils/xindy/m4/ac_prog_latex.m4
deleted file mode 100644
index 3571f5833b0..00000000000
--- a/Build/source/utils/xindy/m4/ac_prog_latex.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl @synopsis AC_PROG_LATEX
-dnl
-dnl This macro test if latex is installed. If latex is installed, it
-dnl set $latex to the right value
-dnl
-dnl @category LaTeX
-dnl @author Mathieu Boretti <boretti@bss-network.com>
-dnl @version 2005-01-21
-dnl @license GPLWithACException
-
-AC_DEFUN([AC_PROG_LATEX],[
-AC_CHECK_PROGS([latex], [latex elatex lambda], [no])
-export latex;
-if test $latex = "no" ;
-then
-	TL_MSG_ERROR([Unable to find a LaTeX application])
-fi
-AC_SUBST(latex)
-])
diff --git a/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4 b/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
deleted file mode 100644
index 878dc7b3007..00000000000
--- a/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl @synopsis AC_PROG_PDFLATEX
-dnl
-dnl This macro test if pdflatex is installed. If pdflatex is installed,
-dnl it set $pdflatex to the right value
-dnl
-dnl @category LaTeX
-dnl @author Mathieu Boretti <boretti@bss-network.com>
-dnl @version 2005-01-21
-dnl @license GPLWithACException
-
-AC_DEFUN([AC_PROG_PDFLATEX],[
-AC_CHECK_PROGS([pdflatex], [pdflatex], [no])
-export pdflatex;
-if test $pdflatex = "no" ;
-then
-	TL_MSG_ERROR([Unable to find a PDFLaTeX application])
-fi
-AC_SUBST(pdflatex)
-])
diff --git a/Build/source/utils/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/make-rules/Makefile.in
index 5c855f87ea7..f1b89bd371a 100644
--- a/Build/source/utils/xindy/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,6 +65,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -142,7 +141,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -151,7 +149,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
index 4218fd0a3cb..e90382963c6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
@@ -741,75 +741,75 @@ nodist_noinst_DATA = \
 
 %latin1.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-1 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-1 >$@
 
 %cp850.pl : %utf8.pl.in
 	sed -e 's/@.{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@CP850 >$@
+	$(CONVERT_FROM_UTF8)CP850 >$@
 
 romanian/latin2.pl : romanian/utf8.pl
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-2 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-2 >$@
 
 %latin2.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-2 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-2 >$@
 
 %latin3.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-3 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-3 >$@
 
 %latin4.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-4 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-4 >$@
 
 %iso88595.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-5 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-5 >$@
 
 %iso88597.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-7 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-7 >$@
 
 %iso88598.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-8 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-8 >$@
 
 %latin5.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-9 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-9 >$@
 
 %latin9.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-15 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-15 >$@
 
 romanian/cp1250.pl : romanian/utf8.pl
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	@CONVERT_FROM_UTF8@CP1250 >$@
+	$(CONVERT_FROM_UTF8)CP1250 >$@
 
 %cp1250.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@CP1250 >$@
+	$(CONVERT_FROM_UTF8)CP1250 >$@
 
 %cp1251.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@CP1251 >$@
+	$(CONVERT_FROM_UTF8)CP1251 >$@
 
 %cp1252.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
-	@CONVERT_FROM_UTF8@CP1252 >$@
+	$(CONVERT_FROM_UTF8)CP1252 >$@
 
 %isoir111.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-IR-111 >$@
+	$(CONVERT_FROM_UTF8)ISO-IR-111 >$@
 
 %koi8-r.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@KOI8-R >$@
+	$(CONVERT_FROM_UTF8)KOI8-R >$@
 
 %koi8-u.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@KOI8-U >$@
+	$(CONVERT_FROM_UTF8)KOI8-U >$@
 
 %tex.pl : %utf8.pl $(srcdir)/utf8-to-tex.sed
 	sed -f $(srcdir)/utf8-to-tex.sed <$< >$@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
index e48463959cc..013c8fb65a6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -165,6 +163,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -240,7 +239,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -249,7 +247,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -2357,75 +2354,75 @@ uninstall-am: uninstall-docDATA uninstall-nodist_albanianDATA \
 
 %latin1.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-1 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-1 >$@
 
 %cp850.pl : %utf8.pl.in
 	sed -e 's/@.{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@CP850 >$@
+	$(CONVERT_FROM_UTF8)CP850 >$@
 
 romanian/latin2.pl : romanian/utf8.pl
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-2 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-2 >$@
 
 %latin2.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-2 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-2 >$@
 
 %latin3.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-3 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-3 >$@
 
 %latin4.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-4 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-4 >$@
 
 %iso88595.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-5 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-5 >$@
 
 %iso88597.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-7 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-7 >$@
 
 %iso88598.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-8 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-8 >$@
 
 %latin5.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-9 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-9 >$@
 
 %latin9.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-8859-15 >$@
+	$(CONVERT_FROM_UTF8)ISO-8859-15 >$@
 
 romanian/cp1250.pl : romanian/utf8.pl
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	@CONVERT_FROM_UTF8@CP1250 >$@
+	$(CONVERT_FROM_UTF8)CP1250 >$@
 
 %cp1250.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@CP1250 >$@
+	$(CONVERT_FROM_UTF8)CP1250 >$@
 
 %cp1251.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@CP1251 >$@
+	$(CONVERT_FROM_UTF8)CP1251 >$@
 
 %cp1252.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
-	@CONVERT_FROM_UTF8@CP1252 >$@
+	$(CONVERT_FROM_UTF8)CP1252 >$@
 
 %isoir111.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@ISO-IR-111 >$@
+	$(CONVERT_FROM_UTF8)ISO-IR-111 >$@
 
 %koi8-r.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@KOI8-R >$@
+	$(CONVERT_FROM_UTF8)KOI8-R >$@
 
 %koi8-u.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	@CONVERT_FROM_UTF8@KOI8-U >$@
+	$(CONVERT_FROM_UTF8)KOI8-U >$@
 
 %tex.pl : %utf8.pl $(srcdir)/utf8-to-tex.sed
 	sed -f $(srcdir)/utf8-to-tex.sed <$< >$@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
index e0ce28518a2..36e2d2aa6bb 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/albanian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
index ca94a62afd0..c26ac114be4 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/belarusian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
index f1f362053b3..7a8a56eef78 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/bulgarian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
index 5faa7022c03..4d2f4f64b73 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/croatian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
index 8c58fe8181c..ccd42ac3373 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/czech
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
index f8d483aacb5..9b5a65ccc88 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/danish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
index dd3798575ec..64efb76bc2e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/dutch
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
index d1bda724874..099c26b0cb6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/english
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
index f046a043850..24cd5ee8dee 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/esperanto
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
index ae4d3560cfd..f18295dc7dc 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/estonian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
index cd882482bc0..f34b85e8dda 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/finnish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
index 287c0cf06c3..82f664c103b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/french
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
index d73e710303e..a29fa794d3f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/general
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
index 41b49e2dc11..0ec4f7d2c19 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/georgian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
index 27c0fc73838..c3da3792baa 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/german
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
index ad01d4a9af2..e5151fdf05a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/greek
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
index f93f756d521..02df3fbc8ee 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/gypsy
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
index ce97d3dccc2..244850da6d1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/hausa
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
index 5283f9428d6..13835650c3f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/hebrew
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
index 3dc198bde2f..e53e70d09d6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/hungarian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
index 4aa56b1f689..e8dfdc4cdfd 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/icelandic
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
index d0eedbd3b42..cc9770f03e6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/italian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
index 3a50867902a..757f2ba03d1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/klingon
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
index c361c904457..18658ac0d28 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/kurdish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
index dd4673d31f1..bd16794884b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/latin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
index dd19ad1030d..3e443a064d7 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/latvian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
index 1d0322eb2eb..cf477cc9412 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/lithuanian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
index 0a0f84cb70c..3be885b4d85 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/lower-sorbian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
index e5e8d1b5d0d..fbeb71f749a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/macedonian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
index 2fdc077c062..35d6d8097b8 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/mongolian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
index 57292c942c1..19b4ec16900 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/norwegian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
index 5eb74d66683..6c94d673f80 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/polish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
index fa66f0aa640..0d9b45a75fd 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/portuguese
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
index 250054c9dc7..e65616ae8d4 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/romanian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
index 16722b4509b..07a5b7d6e54 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/russian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
index 73b41726b65..e3f807562bb 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/serbian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
index 085d34d296b..8df63c20dbf 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/slovak
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
index a77e2ea6a22..6ace7933eda 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/slovenian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
index 07bf7614f72..730480313c6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/spanish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
index 513caa76a43..09118c66330 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/swedish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
index 570b9743e2d..4752d2d909e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/test1
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
index 74c440aa815..244544cc605 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/turkish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
index 60e1c5c8bd2..e468aaa31a3 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/ukrainian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
index dae7c52056d..6540b533aef 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/upper-sorbian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
index 2969e1097ba..978a1d0489d 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = make-rules/alphabets/vietnamese
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,6 +53,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -130,7 +129,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -139,7 +137,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
index 80bad92d798..38733fd60a0 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = make-rules/inputenc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in
index de33640a3db..c4d8bfa7ad6 100644
--- a/Build/source/utils/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = make-rules/styles
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/Makefile.in b/Build/source/utils/xindy/modules/Makefile.in
index 1b3cbd74a5b..53537557c34 100644
--- a/Build/source/utils/xindy/modules/Makefile.in
+++ b/Build/source/utils/xindy/modules/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,6 +65,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -142,7 +141,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -151,7 +149,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in
index 46628e1717a..9a28ca1acc2 100644
--- a/Build/source/utils/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/modules/base/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/base
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in
index a23ddac9d3d..5184802eb8e 100644
--- a/Build/source/utils/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/modules/class/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/class
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/modules/lang/Makefile.in
index cb7ad8f9574..b2eb96155f5 100644
--- a/Build/source/utils/xindy/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = modules/lang
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,6 +65,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -142,7 +141,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -151,7 +149,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in
index df7ec67ea60..cfe6861ba0c 100644
--- a/Build/source/utils/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/lang/german
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
index bde10ee2b68..e3fe8a3e3a8 100644
--- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/lang/latin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in
index ea7c83d522c..debe6c33b85 100644
--- a/Build/source/utils/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/modules/ord/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/ord
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in
index 160780ddc7c..67603b04e8a 100644
--- a/Build/source/utils/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/modules/rules/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/rules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in
index 6ec20b6dde7..c05e5b14b3e 100644
--- a/Build/source/utils/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/modules/styles/Makefile.in
@@ -35,10 +35,8 @@ host_triplet = @host@
 subdir = modules/styles
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,6 +63,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -140,7 +139,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -149,7 +147,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index d0fbdd90f25..3b05f54b40b 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -29,16 +29,16 @@ binariesdir = ../binaries
 
 all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem
 
-## Serialize to allow parallel builds
-##
+# Serialize to allow parallel builds
+#
 $(binariesdir)/base.mem: $(binariesdir)/$(XINDY_RUN)
 	cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
 $(binariesdir)/$(XINDY_RUN):
 	rm -rf xindy-build-dir
 	test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
 	$(MAKE) -C ordrules ordrulei.c
-	env CLISP_LINKKIT='@CLISP_LIB@/linkkit' MAKE="$(MAKE)" \
-	sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir
+	env CLISP_LINKKIT='$(CLISP_LIB)/linkkit' MAKE="$(MAKE)" \
+	sh '$(CLISP_LIB)/clisp-link' add-module-set ordrules '$(CLISP_LIB)/full' xindy-build-dir
 	cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
 
 clean-local:
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index 2ad0f7b441f..05ce32729b3 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -34,10 +34,8 @@ host_triplet = @host@
 subdir = rte
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,6 +65,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -142,7 +141,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -151,7 +149,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -475,14 +472,16 @@ uninstall-am:
 
 all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem
 
+# Serialize to allow parallel builds
+#
 $(binariesdir)/base.mem: $(binariesdir)/$(XINDY_RUN)
 	cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
 $(binariesdir)/$(XINDY_RUN):
 	rm -rf xindy-build-dir
 	test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
 	$(MAKE) -C ordrules ordrulei.c
-	env CLISP_LINKKIT='@CLISP_LIB@/linkkit' MAKE="$(MAKE)" \
-	sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir
+	env CLISP_LINKKIT='$(CLISP_LIB)/linkkit' MAKE="$(MAKE)" \
+	sh '$(CLISP_LIB)/clisp-link' add-module-set ordrules '$(CLISP_LIB)/full' xindy-build-dir
 	cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
 
 clean-local:
diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in
index f58eb740d29..2be01a78817 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.in
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in
@@ -37,10 +37,8 @@ subdir = rte/ordrules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/version.lisp.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -58,6 +56,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -133,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -142,7 +140,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/src/Makefile.in b/Build/source/utils/xindy/src/Makefile.in
index d7f50c630de..17e41f18d35 100644
--- a/Build/source/utils/xindy/src/Makefile.in
+++ b/Build/source/utils/xindy/src/Makefile.in
@@ -36,10 +36,8 @@ host_triplet = @host@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -57,6 +55,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -132,7 +131,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -141,7 +139,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in
index 08a3fc44922..33c45ba520a 100644
--- a/Build/source/utils/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/tex2xindy/Makefile.in
@@ -36,10 +36,8 @@ bin_PROGRAMS = tex2xindy$(EXEEXT)
 subdir = tex2xindy
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in tex2xindy.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -78,6 +76,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -153,7 +152,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -162,7 +160,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 6d13c8f9b61..34d496578d3 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -36,10 +36,8 @@ subdir = user-commands
 DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(dist_noinst_SCRIPTS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
-	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
-	$(top_srcdir)/m4/tl_msg_error.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/tl_msg_error.m4 \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -66,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CLISP_LIB = @CLISP_LIB@
 CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -141,7 +140,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-latex = @latex@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -150,7 +148,6 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pdflatex = @pdflatex@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@