build system: cleanup xindy, remove some unused files

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

1 files changed, 32 insertions, 27 deletions

diff --git a/Build/source/configure b/Build/source/configure
index 81f6707b4a4..eb042a7eac0 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -928,7 +928,7 @@ enable_t1utils
 enable_tpic2pdftex
 enable_vlna
 enable_xindy
-enable_xindy_make_rules
+enable_xindy_rules
 enable_xindy_docs
 with_xindy_recode
 enable_web2c
@@ -1707,9 +1707,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
@@ -2621,9 +2620,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
@@ -5998,13 +5997,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6001: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6000: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6004: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6003: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6007: output\"" >&5)
+  (eval echo "\"\$as_me:6006: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7210,7 +7209,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7213 "configure"' > conftest.$ac_ext
+  echo '#line 7212 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9257,11 +9256,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9259: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9264: \$? = $ac_status" >&5
+   echo "$as_me:9263: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9596,11 +9595,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9599: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9603: \$? = $ac_status" >&5
+   echo "$as_me:9602: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9701,11 +9700,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9704: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9703: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9708: \$? = $ac_status" >&5
+   echo "$as_me:9707: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9756,11 +9755,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9759: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9758: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9763: \$? = $ac_status" >&5
+   echo "$as_me:9762: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12556,7 +12555,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12559 "configure"
+#line 12558 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12652,7 +12651,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12655 "configure"
+#line 12654 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19048,11 +19047,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19051: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19050: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19055: \$? = $ac_status" >&5
+   echo "$as_me:19054: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19147,11 +19146,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19150: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19149: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19154: \$? = $ac_status" >&5
+   echo "$as_me:19153: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19199,11 +19198,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19202: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19201: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19206: \$? = $ac_status" >&5
+   echo "$as_me:19205: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20199,6 +20198,9 @@ $as_echo "$as_me: error: Sorry, not found under any of: $list *****" >&2;}
   fi
 fi
 
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
+
 syslib_status=yes
 if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
@@ -23146,6 +23148,9 @@ if test "x$syslib_status" = xno; then
 $as_echo "$as_me: error: some requested system libraries failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
 
 if test "x$cross_compiling:$enable_xetex" = xyes:yes; then
   { { $as_echo "$as_me:$LINENO: error: Sorry, can not cross compile icu libraries required for XeTeX" >&5