diff options
-rwxr-xr-x | Build/source/configure | 50 | ||||
-rwxr-xr-x | Build/source/libs/configure | 10 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 8 | ||||
-rwxr-xr-x | Build/source/texk/configure | 10 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/ac/web2c.ac | 7 | ||||
-rwxr-xr-x | Build/source/texk/kpathsea/configure | 11 | ||||
-rwxr-xr-x | Build/source/utils/configure | 10 |
8 files changed, 65 insertions, 45 deletions
diff --git a/Build/source/configure b/Build/source/configure index 5fd720b0e1b..58f1f694d1a 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1791,7 +1791,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 @@ -3503,8 +3504,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; @@ -3551,7 +3553,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 @@ -6172,13 +6174,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:6175: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6177: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6178: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6180: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6181: output\"" >&5) + (eval echo "\"\$as_me:6183: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7384,7 +7386,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7387 "configure"' > conftest.$ac_ext + echo '#line 7389 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9330,11 +9332,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:9333: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9335: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9337: \$? = $ac_status" >&5 + echo "$as_me:9339: \$? = $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. @@ -9669,11 +9671,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:9672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9674: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9676: \$? = $ac_status" >&5 + echo "$as_me:9678: \$? = $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. @@ -9774,11 +9776,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:9777: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9779: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9781: \$? = $ac_status" >&5 + echo "$as_me:9783: \$? = $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 @@ -9829,11 +9831,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:9832: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9834: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9836: \$? = $ac_status" >&5 + echo "$as_me:9838: \$? = $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 @@ -12629,7 +12631,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12632 "configure" +#line 12634 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12725,7 +12727,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12728 "configure" +#line 12730 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19159,11 +19161,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:19162: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19164: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19166: \$? = $ac_status" >&5 + echo "$as_me:19168: \$? = $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. @@ -19258,11 +19260,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:19261: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19263: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19265: \$? = $ac_status" >&5 + echo "$as_me:19267: \$? = $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 @@ -19310,11 +19312,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:19313: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19315: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19317: \$? = $ac_status" >&5 + echo "$as_me:19319: \$? = $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 diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 14963c76bd3..a0613e446d4 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -1540,7 +1540,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 @@ -3212,8 +3213,9 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" 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; @@ -3260,7 +3262,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 diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 416d95b3a8b..23ae04a5dc5 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -751,6 +751,10 @@ dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -780,6 +784,8 @@ distcheck: dist bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -953,7 +959,7 @@ uninstall-am: .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ clean clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \ ctags dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 53ed22ddf99..e036d48e0c7 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -1558,7 +1558,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 @@ -3230,8 +3231,9 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" 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; @@ -3278,7 +3280,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 diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 90c643d5894..d6d624b1836 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2009-06-10 Karl Berry <karl@tug.org> + + * ac/web2c.ac (mktexfmt): default to yes. + 2009-06-02 Karl Berry <karl@tug.org> * types.h (kpse_file_format_type): add kpse_mlbib_format, diff --git a/Build/source/texk/kpathsea/ac/web2c.ac b/Build/source/texk/kpathsea/ac/web2c.ac index ef7164aba52..ccdd5c0a39d 100644 --- a/Build/source/texk/kpathsea/ac/web2c.ac +++ b/Build/source/texk/kpathsea/ac/web2c.ac @@ -1,9 +1,10 @@ -## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ +## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live +## subdirectory texk/kpathsea. dnl dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl -## configure options for mktextmf-default & Co +## configure defaults for mktexfmt & Co. m4_define_default([kpse_indent_26], [26])[]dnl m4_define([kpse_mktex_opts], [dnl [[mktexmf], [yes], [MF source], [TEX_MF]], @@ -11,7 +12,7 @@ m4_define([kpse_mktex_opts], [dnl [[mktextfm], [yes], [TFM file], [TEX_TFM]], [[mkocp], [yes], [OCP file], [OMEGA_OCP]], [[mkofm], [yes], [OFM file], [OMEGA_OFM]], -[[mktexfmt], [no], [format file], [TEX_FMT]], +[[mktexfmt], [yes], [format file], [TEX_FMT]], [[mktextex], [no], [TeX source], [TEX_TEX]], ])[]dnl m4_foreach([Kpse_Mktex], [kpse_mktex_opts], diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure index de485948fcb..2df24533c5d 100755 --- a/Build/source/texk/kpathsea/configure +++ b/Build/source/texk/kpathsea/configure @@ -1576,8 +1576,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 @@ -12898,8 +12898,9 @@ _ACEOF 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; @@ -12946,7 +12947,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 diff --git a/Build/source/utils/configure b/Build/source/utils/configure index ac6d004c655..ebae40dfc43 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -1537,7 +1537,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 @@ -3209,8 +3210,9 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'" 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; @@ -3257,7 +3259,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 |