diff options
Diffstat (limited to 'Build/source/texk/web2c/configure')
-rwxr-xr-x | Build/source/texk/web2c/configure | 113 |
1 files changed, 22 insertions, 91 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index dff1b447fe4..e69e588d356 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -755,7 +755,6 @@ LIBADD_SHL_LOAD LIBADD_DLOPEN LT_DLLOADERS subdirs -LUATANGLE OTANGLE TIE CTANGLE @@ -5281,13 +5280,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:5284: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5283: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5287: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5286: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5290: output\"" >&5) + (eval echo "\"\$as_me:5289: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6490,7 +6489,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6493 "configure"' > conftest.$ac_ext + echo '#line 6492 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8420,11 +8419,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:8423: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8422: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8427: \$? = $ac_status" >&5 + echo "$as_me:8426: \$? = $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. @@ -8759,11 +8758,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:8762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8761: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8766: \$? = $ac_status" >&5 + echo "$as_me:8765: \$? = $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. @@ -8864,11 +8863,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:8867: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8866: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8871: \$? = $ac_status" >&5 + echo "$as_me:8870: \$? = $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 @@ -8919,11 +8918,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:8922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8921: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8926: \$? = $ac_status" >&5 + echo "$as_me:8925: \$? = $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 @@ -11286,7 +11285,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11289 "configure" +#line 11288 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11382,7 +11381,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11385 "configure" +#line 11384 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15183,11 +15182,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:15186: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15185: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15190: \$? = $ac_status" >&5 + echo "$as_me:15189: \$? = $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. @@ -15282,11 +15281,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:15285: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15284: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15289: \$? = $ac_status" >&5 + echo "$as_me:15288: \$? = $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 @@ -15334,11 +15333,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:15337: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15336: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15341: \$? = $ac_status" >&5 + echo "$as_me:15340: \$? = $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 @@ -21956,55 +21955,6 @@ else OTANGLE=./otangle fi -if test "x$cross_compiling" = xyes; then -# Extract the first word of "luatangle", so it can be a program name with args. -set dummy luatangle; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_LUATANGLE+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $LUATANGLE in - [\\/]* | ?:[\\/]*) - ac_cv_path_LUATANGLE="$LUATANGLE" # Let the user override the test with a path. - ;; - *) - 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_path_LUATANGLE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LUATANGLE=$ac_cv_path_LUATANGLE -if test -n "$LUATANGLE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LUATANGLE" >&5 -$as_echo "$LUATANGLE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "${LUATANGLE}"; then - as_fn_error "luatangle was not found but is required when cross-compiling. - Install luatangle or set \$LUATANGLE to the full pathname." "$LINENO" 5 -fi -else - LUATANGLE=./luatangle -fi - if test "x$cross_compiling" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your tie supports WEBINPUTS" >&5 @@ -22043,24 +21993,6 @@ $as_echo "$tool_ok" >&6; } fi rm -f cftest.p fi - if test "x$enable_luatex" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your luatangle supports WEBINPUTS" >&5 -$as_echo_n "checking if your luatangle supports WEBINPUTS... " >&6; } - ( WEBINPUTS=$srcdir/cftests - export WEBINPUTS - $LUATANGLE cftest cftest ) >/dev/null 2>&1 - if diff cftest.p $srcdir/cftests/lcftest.p >/dev/null 2>&1; then - tool_ok=yes - else - tool_ok=no - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_ok" >&5 -$as_echo "$tool_ok" >&6; } - if test "x$tool_ok" != xyes; then - as_fn_error "Sorry, your $LUATANGLE is too old and does not support WEBINPUTS" "$LINENO" 5 - fi - rm -f cftest.p - fi fi @@ -22068,7 +22000,7 @@ fi subdirs="$subdirs web2c" -ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile ptexdir/lib/Makefile omegafonts/Makefile otps/Makefile window/Makefile" +ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile ptexdir/lib/Makefile window/Makefile" ac_config_files="$ac_config_files web2c-sh" @@ -22080,7 +22012,6 @@ ac_config_files="$ac_config_files ctangleboot-sh" - LT_DLLOADERS= @@ -23589,9 +23520,9 @@ do "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "ptexdir/lib/Makefile") CONFIG_FILES="$CONFIG_FILES ptexdir/lib/Makefile" ;; "omegafonts/Makefile") CONFIG_FILES="$CONFIG_FILES omegafonts/Makefile" ;; "otps/Makefile") CONFIG_FILES="$CONFIG_FILES otps/Makefile" ;; + "ptexdir/lib/Makefile") CONFIG_FILES="$CONFIG_FILES ptexdir/lib/Makefile" ;; "window/Makefile") CONFIG_FILES="$CONFIG_FILES window/Makefile" ;; "web2c-sh") CONFIG_FILES="$CONFIG_FILES web2c-sh" ;; "tangle-sh") CONFIG_FILES="$CONFIG_FILES tangle-sh" ;; |