diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-12-07 10:47:30 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-12-07 10:47:30 +0000 |
commit | e84ea0384009f65714151198b3138c148cf5e890 (patch) | |
tree | bbc42a7bc310740c94e802ceca0229388177de7c /Build/source/utils/configure | |
parent | 527ba05256a88ec3960d769889dbb67809dd8b48 (diff) |
build system update for xindy-2.4 (xindy-new)
git-svn-id: svn://tug.org/texlive/trunk@16321 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/configure')
-rwxr-xr-x | Build/source/utils/configure | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 634ec932c13..3754159e51f 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -654,7 +654,7 @@ enable_vlna enable_xindy_new enable_xindy_rules enable_xindy_docs -with_system_clisp +with_clisp_runtime with_xindy_recode enable_xindy enable_web2c @@ -1506,7 +1506,9 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-system-clisp do not install `clisp' for `xindy', use the + --with-clisp-runtime=PATH + pathname of clisp runtime to install for `xindy', + `default' to derive from clisp, or `system' to use installed version --with-recode use `recode' instead of `iconv' to build xindy-new [default: no] @@ -2381,9 +2383,9 @@ if test "${enable_xindy_docs+set}" = set; then : enableval=$enable_xindy_docs; fi -# Check whether --with-system-clisp was given. -if test "${with_system_clisp+set}" = set; then : - withval=$with_system_clisp; +# Check whether --with-clisp-runtime was given. +if test "${with_clisp_runtime+set}" = set; then : + withval=$with_clisp_runtime; fi # Check whether --with-xindy-recode was given. @@ -2393,22 +2395,26 @@ fi ## utils/xindy-new/ac/clisp.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy-new/ ## configure checks for xindy-new and clisp -case $with_system_clisp in #( - no) : +case $with_clisp_runtime in #( + default) : ;; #( - yes) : + system) : if test "x$enable_native_texlive_build" = xyes; then : as_fn_error "you can not use the installed clisp for a native TeX Live build" "$LINENO" 5 fi ;; #( - *) : + "") : if test "x$enable_native_texlive_build" = xyes; then : - with_system_clisp=no + with_clisp_runtime=default else - with_system_clisp=yes + with_clisp_runtime=system fi - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-system-clisp=$with_system_clisp'" >&5 -$as_echo "$as_me: Assuming \`--with-system-clisp=$with_system_clisp'" >&6;} - ac_configure_args="$ac_configure_args '--with-system-clisp=$with_system_clisp'" ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&5 +$as_echo "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;} + ac_configure_args="$ac_configure_args '--with-clisp-runtime=$with_clisp_runtime'" ;; #( + *) : + if test ! -f "$with_clisp_runtime"; then : + as_fn_error "no such file: \"$with_clisp_runtime\"" "$LINENO" 5 +fi ;; esac |