autoreconf

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

68 files changed, 144 insertions, 20 deletions

diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 5d6c1b0fe1b..9ce88d90119 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -94,6 +94,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in
index 0e025109d6a..9cf8217ec63 100644
--- a/Build/source/utils/xindy/binaries/Makefile.in
+++ b/Build/source/utils/xindy/binaries/Makefile.in
@@ -67,6 +67,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index e76cbfe544f..e2938fb33ba 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -695,6 +695,7 @@ am__fastdepCC_FALSE
 LEX
 LEX_OUTPUT_ROOT
 LEXLIB
+CONVERT_FROM_UTF8
 TETEX_BUILD_TRUE
 TETEX_BUILD_FALSE
 latex
@@ -1323,6 +1324,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-clisp=...        Use the specified location of the clisp executable
                           (default is search in PATH)
+  --with-xindy-recode     Use `recode' instead of `iconv' (default is NO)
 
 Some influential environment variables:
   CC          C compiler command
@@ -3703,6 +3705,60 @@ if test "${with_clisp+set}" = set; then
 fi
 
 
+# Check whether --with-xindy-recode was given.
+if test "${with_xindy_recode+set}" = set; then
+  withval=$with_xindy_recode;
+fi
+
+
+if test "x$with_xindy_recode" = xno; then
+  CONVERT_FROM_UTF8="iconv -f UTF-8 -t "
+else
+  # Extract the first word of "recode", so it can be a program name with args.
+set dummy recode; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CONVERT_FROM_UTF8+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CONVERT_FROM_UTF8"; then
+  ac_cv_prog_CONVERT_FROM_UTF8="$CONVERT_FROM_UTF8" # 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_CONVERT_FROM_UTF8="recode UTF-8.."
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CONVERT_FROM_UTF8=$ac_cv_prog_CONVERT_FROM_UTF8
+if test -n "$CONVERT_FROM_UTF8"; then
+  { echo "$as_me:$LINENO: result: $CONVERT_FROM_UTF8" >&5
+echo "${ECHO_T}$CONVERT_FROM_UTF8" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  if test "x$CONVERT_FROM_UTF8" != "xrecode UTF-8.."; then
+    { { echo "$as_me:$LINENO: error: --with-xindy-recode specified, but \`recode' not found" >&5
+echo "$as_me: error: --with-xindy-recode specified, but \`recode' not found" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+
 if test "x$enable_tetex_build" = xyes -a "x$datadir" = "x$prefix"; then
   { echo "$as_me:$LINENO: Using installation layout for TeX Live" >&5
 echo "$as_me: Using installation layout for TeX Live" >&6;}
@@ -5803,6 +5859,7 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
 LEX!$LEX$ac_delim
 LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 LEXLIB!$LEXLIB$ac_delim
+CONVERT_FROM_UTF8!$CONVERT_FROM_UTF8$ac_delim
 TETEX_BUILD_TRUE!$TETEX_BUILD_TRUE$ac_delim
 TETEX_BUILD_FALSE!$TETEX_BUILD_FALSE$ac_delim
 latex!$latex$ac_delim
@@ -5818,7 +5875,6 @@ LISP_RUN!$LISP_RUN$ac_delim
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
-build!$build$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -5860,6 +5916,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
 build_os!$build_os$ac_delim
@@ -5871,7 +5928,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/Build/source/utils/xindy/doc/Makefile.in b/Build/source/utils/xindy/doc/Makefile.in
index 373013ac528..5e32b8a7335 100644
--- a/Build/source/utils/xindy/doc/Makefile.in
+++ b/Build/source/utils/xindy/doc/Makefile.in
@@ -77,6 +77,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
index 5afecd2c507..21428f0f736 100644
--- a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/make-rules/Makefile.in
index 74f6fe268b5..1f5a61b27d2 100644
--- a/Build/source/utils/xindy/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/Makefile.in
@@ -66,6 +66,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
index 61a68dfe764..e2f8ea077b3 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
@@ -164,6 +164,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -2351,75 +2352,75 @@ uninstall-am: uninstall-docDATA uninstall-nodist_albanianDATA \
 
 %latin1.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-1 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-1 >$@
 
 %cp850.pl : %utf8.pl.in
 	sed -e 's/@.{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t CP850 >$@
+	@CONVERT_FROM_UTF8@CP850 >$@
 
 romanian/latin2.pl : romanian/utf8.pl
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	iconv -f UTF-8 -t ISO-8859-2 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-2 >$@
 
 %latin2.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-2 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-2 >$@
 
 %latin3.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-3 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-3 >$@
 
 %latin4.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-4 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-4 >$@
 
 %iso88595.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-5 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-5 >$@
 
 %iso88597.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-7 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-7 >$@
 
 %iso88598.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-8 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-8 >$@
 
 %latin5.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-8859-9 >$@
+	@CONVERT_FROM_UTF8@ISO-8859-9 >$@
 
 %latin9.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
-	iconv -f UTF-8 -t 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 <$< | \
-	iconv -f UTF-8 -t CP1250 >$@
+	@CONVERT_FROM_UTF8@CP1250 >$@
 
 %cp1250.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t CP1250 >$@
+	@CONVERT_FROM_UTF8@CP1250 >$@
 
 %cp1251.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t CP1251 >$@
+	@CONVERT_FROM_UTF8@CP1251 >$@
 
 %cp1252.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
-	iconv -f UTF-8 -t CP1252 >$@
+	@CONVERT_FROM_UTF8@CP1252 >$@
 
 %isoir111.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t ISO-IR-111 >$@
+	@CONVERT_FROM_UTF8@ISO-IR-111 >$@
 
 %koi8-r.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t KOI8-R >$@
+	@CONVERT_FROM_UTF8@KOI8-R >$@
 
 %koi8-u.pl : %utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
-	iconv -f UTF-8 -t 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 22f1f91184a..323391ba2aa 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 22a263bbed5..40d64ad8188 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 3b653abf210..cd59cb427c0 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 828ef8bbdb1..35116a680d1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 f377d878e16..ecd2763a078 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 1300bc2fa86..a948a207a54 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 faa2317af31..ceaa03a69e2 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 23a183f0f9a..ae422d5fe1d 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 ee5a0cd4f6e..0a9e1801a9f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 666ea309614..b26966621a1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 9cc7668e0c5..46c1196bbb7 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 03534305768..a5c6c234c0a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 b0bf2d3109e..f446f1635d6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 53a7d4087cc..9b14065bc24 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 9777bc94db8..7e0706a1511 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 1197d0aefd1..43e73570fa0 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 4ad7b4da98a..159f1e0dc13 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 c82ca9ce04c..5bfcca85a0f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 6a2cfd2ae5e..00178dc9e14 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 63a49b3f363..eb3fbade09a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 26272e9b32b..cef352ac7e0 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 985168cc1ce..b1f085f2a55 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 62eca7d4ee0..0ddb97b811f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 fb68d54f9ee..12523fa18b4 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 f105d87c40a..0ccc957de62 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 96ca45a9872..df286bf3d7b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 5720239627a..459f524351e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 f8345702b42..a3ac39ed4ff 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
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 c43f79004ad..cc5fd9e654e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 8422cd99978..823d34b43c8 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 b5125412186..e8c49ca01ed 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 a20434fc3f0..1b01011a076 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 aa1b2d0eaa5..45b84ae44ee 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 5afc306f159..347b868bbdf 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 bfba9590933..db67184dd3c 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 17d7cc579c4..cd4f04c4e8f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 49eea324767..ba2fb6bbf57 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 916ea99cbea..2b8e703dc0e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 33e2d33f581..1885d2a2ed9 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 eff1ac414ab..0a7097a00be 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 009f22a1b61..53306a29a73 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 e75761ff38a..c0592a5bb4a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 7d490b595b9..419256d1c93 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 c86bce7cd62..b8103e27503 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
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
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 d2fbe61158e..0c3b074bc76 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
@@ -54,6 +54,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
index 06d4360c4df..06b15e9b09d 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in
index d322d67e51e..9c201b156d5 100644
--- a/Build/source/utils/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/Makefile.in b/Build/source/utils/xindy/modules/Makefile.in
index 81b0d157059..838a5bd2741 100644
--- a/Build/source/utils/xindy/modules/Makefile.in
+++ b/Build/source/utils/xindy/modules/Makefile.in
@@ -66,6 +66,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in
index 2fd7793b938..48d63f4ef04 100644
--- a/Build/source/utils/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/modules/base/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in
index bc27badc99b..25a22f11dc7 100644
--- a/Build/source/utils/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/modules/class/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/modules/lang/Makefile.in
index 4d14f66b35b..c1ba440601c 100644
--- a/Build/source/utils/xindy/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/Makefile.in
@@ -66,6 +66,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in
index da7e5e83cb9..a8936190bdb 100644
--- a/Build/source/utils/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
index d678f6fd8b1..40422ffe0dd 100644
--- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in
index 16d4ad784a5..ab1b65010cb 100644
--- a/Build/source/utils/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/modules/ord/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in
index db5dc146478..00deeaf3017 100644
--- a/Build/source/utils/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/modules/rules/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in
index 02fa2104c43..ce3cd5e5e7f 100644
--- a/Build/source/utils/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/modules/styles/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index 7829a55aba6..cf131054f9c 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -66,6 +66,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in
index 9386ef8497f..deefde6b265 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.in
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in
@@ -57,6 +57,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/src/Makefile.in b/Build/source/utils/xindy/src/Makefile.in
index 23b0c2f1275..fc08f97eb89 100644
--- a/Build/source/utils/xindy/src/Makefile.in
+++ b/Build/source/utils/xindy/src/Makefile.in
@@ -56,6 +56,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in
index c3572f9c1fd..b377215505a 100644
--- a/Build/source/utils/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/tex2xindy/Makefile.in
@@ -77,6 +77,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 539c34fd01f..33d626f5845 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -65,6 +65,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@