diff options
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-x | Build/source/configure | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/Build/source/configure b/Build/source/configure index 3badb21b4eb..24efa74ddc7 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -920,6 +920,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_missing enable_all_pkgs enable_native_texlive_build enable_multiplatform @@ -1700,6 +1701,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-missing terminate if a requested program or feature must be + disabled, e.g., due to missing libraries --disable-all-pkgs do not build packages unless explicitly enabled --disable-native-texlive-build do not build for the TeX Live binary distribution @@ -1794,7 +1797,8 @@ Optional Features: do not run mktextfm if TFM file missing --disable-mkocp-default do not run mkocp if OCP file missing --disable-mkofm-default do not run mkofm if OFM file missing - --enable-mktexfmt-default run mktexfmt if format file missing + --disable-mktexfmt-default + do not run mktexfmt if format file missing --enable-mktextex-default run mktextex if TeX source missing --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -2366,6 +2370,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Check whether --enable-missing was given. +if test "${enable_missing+set}" = set; then + enableval=$enable_missing; +fi + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -3524,8 +3533,9 @@ $as_echo "$as_me: Using \`kpathsea' headers and library from TL tree" >&6;} fi fi -## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ -## configure options for mktextmf-default & Co +## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live +## subdirectory texk/kpathsea. +## configure defaults for mktexfmt & Co. # Check whether --enable-mktexmf-default was given. if test "${enable_mktexmf_default+set}" = set; then enableval=$enable_mktexmf_default; @@ -3572,7 +3582,7 @@ if test "${enable_mktexfmt_default+set}" = set; then fi case $enable_mktexfmt_default in yes|no) : ;; - *) enable_mktexfmt_default=no ;; + *) enable_mktexfmt_default=yes ;; esac # Check whether --enable-mktextex-default was given. if test "${enable_mktextex_default+set}" = set; then @@ -6193,13 +6203,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:6196: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6206: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6199: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6209: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6202: output\"" >&5) + (eval echo "\"\$as_me:6212: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7405,7 +7415,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7408 "configure"' > conftest.$ac_ext + echo '#line 7418 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9366,11 +9376,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:9369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9379: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9373: \$? = $ac_status" >&5 + echo "$as_me:9383: \$? = $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. @@ -9705,11 +9715,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:9708: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9718: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9712: \$? = $ac_status" >&5 + echo "$as_me:9722: \$? = $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. @@ -9810,11 +9820,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:9813: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9823: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9817: \$? = $ac_status" >&5 + echo "$as_me:9827: \$? = $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 @@ -9865,11 +9875,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:9868: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9878: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9872: \$? = $ac_status" >&5 + echo "$as_me:9882: \$? = $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 @@ -12665,7 +12675,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12668 "configure" +#line 12678 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12761,7 +12771,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12764 "configure" +#line 12774 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19255,11 +19265,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:19258: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19268: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19262: \$? = $ac_status" >&5 + echo "$as_me:19272: \$? = $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. @@ -19354,11 +19364,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:19357: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19367: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19361: \$? = $ac_status" >&5 + echo "$as_me:19371: \$? = $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 @@ -19406,11 +19416,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:19409: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19419: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19413: \$? = $ac_status" >&5 + echo "$as_me:19423: \$? = $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 @@ -20418,17 +20428,6 @@ $as_echo "$as_me: error: You could use \`--without-ln-s' to build without workin { (exit 1); exit 1; }; } fi -## FIXME -if test "x$with_fontconfig" != x; then - { { $as_echo "$as_me:$LINENO: error: Sorry, the configure option \`--with-fontconfig' is no longer supported. - Either use \`--with-fontconfig-includes' and/or \`--with-fontconfig-libdir'. - or (preferably) use pkg-config, if necessary setting PKG_CONFIG." >&5 -$as_echo "$as_me: error: Sorry, the configure option \`--with-fontconfig' is no longer supported. - Either use \`--with-fontconfig-includes' and/or \`--with-fontconfig-libdir'. - or (preferably) use pkg-config, if necessary setting PKG_CONFIG." >&2;} - { (exit 1); exit 1; }; } -fi - if test "x$mandir" = 'x${datarootdir}/man'; then mandir='${prefix}/texmf/doc/man' ac_configure_args="$ac_configure_args '--mandir=$mandir'" |