diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-18 13:33:20 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-18 13:33:20 +0000 |
commit | 793906fc9c8212552f260f828417697e8d6988cb (patch) | |
tree | c482f184dd4f8051fabbb93d9a5deb9eb3c5558f /Build/source/utils/xindy/configure | |
parent | 8e31e7e6203fe17faed3ff44046dc99d9ce31779 (diff) |
build system: cleanup xindy, remove some unused files
git-svn-id: svn://tug.org/texlive/trunk@13202 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy/configure')
-rwxr-xr-x | Build/source/utils/xindy/configure | 190 |
1 files changed, 48 insertions, 142 deletions
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 |