summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-07 10:47:30 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-07 10:47:30 +0000
commite84ea0384009f65714151198b3138c148cf5e890 (patch)
treebbc42a7bc310740c94e802ceca0229388177de7c /Build/source/configure
parent527ba05256a88ec3960d769889dbb67809dd8b48 (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/configure')
-rwxr-xr-xBuild/source/configure74
1 files changed, 40 insertions, 34 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 19954286c85..6b3caf9fa92 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -895,7 +895,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
@@ -1776,7 +1776,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]
@@ -3205,9 +3207,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.
@@ -3217,22 +3219,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
@@ -6848,13 +6854,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:6851: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6857: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6854: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6860: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6857: output\"" >&5)
+ (eval echo "\"\$as_me:6863: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8060,7 +8066,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8063 "configure"' > conftest.$ac_ext
+ echo '#line 8069 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9692,11 +9698,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:9695: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9699: \$? = $ac_status" >&5
+ echo "$as_me:9705: \$? = $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.
@@ -10031,11 +10037,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:10034: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10040: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10038: \$? = $ac_status" >&5
+ echo "$as_me:10044: \$? = $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.
@@ -10136,11 +10142,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:10139: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10145: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10143: \$? = $ac_status" >&5
+ echo "$as_me:10149: \$? = $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
@@ -10191,11 +10197,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:10194: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10198: \$? = $ac_status" >&5
+ echo "$as_me:10204: \$? = $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
@@ -12558,7 +12564,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12561 "configure"
+#line 12567 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12654,7 +12660,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12657 "configure"
+#line 12663 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17128,11 +17134,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:17131: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17137: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17135: \$? = $ac_status" >&5
+ echo "$as_me:17141: \$? = $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.
@@ -17227,11 +17233,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:17230: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17236: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17234: \$? = $ac_status" >&5
+ echo "$as_me:17240: \$? = $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
@@ -17279,11 +17285,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:17282: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17288: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17286: \$? = $ac_status" >&5
+ echo "$as_me:17292: \$? = $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