added the --with-xindy-recode configure option, to allow using `recode' instead of `iconv'

on systems (such as *BSD) which do not support some character set conversion, e.g. from UTF-8 to ISO-IR-111


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

2 files changed, 29 insertions, 18 deletions

diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 1bb1321fdfa..da9a2ba11eb 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -38,6 +38,17 @@ AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules],[build and instal
 AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs],[build and install documentation (default is YES)]))
 AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation]))
 AC_ARG_WITH(clisp, AS_HELP_STRING([--with-clisp=...],[Use the specified location of the clisp executable (default is search in PATH)]))
+AC_ARG_WITH(xindy-recode, AS_HELP_STRING([--with-xindy-recode],[Use `recode' instead of `iconv' (default is NO)]))
+
+if test "x$with_xindy_recode" = xno; then
+  CONVERT_FROM_UTF8="iconv -f UTF-8 -t "
+else
+  AC_CHECK_PROG(CONVERT_FROM_UTF8, recode, [recode UTF-8..])
+  if test "x$CONVERT_FROM_UTF8" != "xrecode UTF-8.."; then
+    AC_MSG_ERROR([--with-xindy-recode specified, but `recode' not found])
+  fi
+fi
+AC_SUBST(CONVERT_FROM_UTF8)
 
 if test "x$enable_tetex_build" = xyes -a "x$datadir" = "x$prefix"; then
   AC_MSG_NOTICE([Using installation layout for TeX Live])
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
index 24543bc4c93..8632ec3720c 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;' <$< | \
-	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 <$< >$@