From d65aa576328f6698d7e7bf7c65119281cbca0981 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 5 Jun 2010 14:10:40 +0000 Subject: build system update/cleanup git-svn-id: svn://tug.org/texlive/trunk@18755 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 88 ++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 68 deletions(-) (limited to 'Build/source/configure') diff --git a/Build/source/configure b/Build/source/configure index 1d92d0c2a88..3f046be2f94 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -901,7 +901,6 @@ enable_xindy_rules enable_xindy_docs with_clisp_runtime with_xindy_recode -enable_xindy_old enable_xpdfopen enable_web2c with_banner_add @@ -1689,7 +1688,6 @@ Optional Features: --enable-xindy build the xindy package --enable-xindy-rules build and install make-rules package --enable-xindy-docs build and install documentation - --enable-xindy-old build the xindy-old package --disable-xpdfopen do not build the xpdfopen package --disable-web2c do not build the web2c (TeX & Co.) package --enable-auto-core cause TeX&MF to dump core, given a certain @@ -1800,8 +1798,6 @@ Optional Packages: installed version --with-recode use `recode' instead of `iconv' to build xindy [default: no] - --with-xindy-recode For `xindy': use `recode' instead of `iconv' - (default is NO) --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT @@ -4152,50 +4148,6 @@ fi ;; esac -## utils/xindy-old/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy-old/ -## configure options and TL libraries required for xindy-old -# Check whether --enable-xindy-old was given. -if test "${enable_xindy_old+set}" = set; then : - enableval=$enable_xindy_old; -fi -case $enable_xindy_old in #( - yes) : - if test "x$cross_compiling" = xyes; then : - as_fn_error "Unable to cross compile xindy-old" "$LINENO" 5 -fi ;; #( - no) : - ;; #( - *) : - if test "x$cross_compiling" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy-old'" >&5 -$as_echo "$as_me: Cross compiling -> \`--disable-xindy-old'" >&6;} - enable_xindy_old=no - ac_configure_args="$ac_configure_args '--disable-xindy-old'" - else - enable_xindy_old=no - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy-old=$enable_xindy_old'" >&5 -$as_echo "$as_me: Assuming \`--enable-xindy-old=$enable_xindy_old'" >&6;} - ac_configure_args="$ac_configure_args '--enable-xindy-old=$enable_xindy_old'" - fi ;; -esac - -## utils/xindy-old/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy-old/ -## configure options for xindy-old -# 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 : - enableval=$enable_xindy_docs; -fi - -# Check whether --with-xindy-recode was given. -if test "${with_xindy_recode+set}" = set; then : - withval=$with_xindy_recode; -fi - - ## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/ ## configure options and TL libraries required for xpdfopen # Check whether --enable-xpdfopen was given. @@ -7045,13 +6997,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:7048: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7000: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7051: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7003: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7054: output\"" >&5) + (eval echo "\"\$as_me:7006: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8253,7 +8205,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8256 "configure"' > conftest.$ac_ext + echo '#line 8208 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10310,11 +10262,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:10313: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10265: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10317: \$? = $ac_status" >&5 + echo "$as_me:10269: \$? = $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. @@ -10649,11 +10601,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:10652: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10604: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10656: \$? = $ac_status" >&5 + echo "$as_me:10608: \$? = $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. @@ -10754,11 +10706,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:10757: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10709: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10761: \$? = $ac_status" >&5 + echo "$as_me:10713: \$? = $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 @@ -10809,11 +10761,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:10812: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10764: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10816: \$? = $ac_status" >&5 + echo "$as_me:10768: \$? = $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 @@ -13176,7 +13128,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13179 "configure" +#line 13131 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13272,7 +13224,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13275 "configure" +#line 13227 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17759,11 +17711,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:17762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17714: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17766: \$? = $ac_status" >&5 + echo "$as_me:17718: \$? = $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. @@ -17858,11 +17810,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:17861: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17813: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17865: \$? = $ac_status" >&5 + echo "$as_me:17817: \$? = $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 @@ -17910,11 +17862,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:17913: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17865: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17917: \$? = $ac_status" >&5 + echo "$as_me:17869: \$? = $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 -- cgit v1.2.3