diff options
Diffstat (limited to 'Build/source')
38 files changed, 1414 insertions, 1463 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 2ac01bbbe11..ce213c83390 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -77,6 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/texk/dvipdfm/ac/withenable.ac \ $(top_srcdir)/texk/dvipdfmx/ac/withenable.ac \ $(top_srcdir)/texk/dvipng/ac/withenable.ac \ + $(top_srcdir)/texk/dvipng/ac/dvipng.ac \ $(top_srcdir)/texk/dvipos/ac/withenable.ac \ $(top_srcdir)/texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/texk/gsftopk/ac/withenable.ac \ diff --git a/Build/source/configure b/Build/source/configure index e88382d6900..63a2be6f719 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -960,6 +960,9 @@ enable_dviljk enable_dvipdfm enable_dvipdfmx enable_dvipng +enable_debug +enable_timing +with_gs enable_dvipos enable_dvipsk enable_gsftopk @@ -1688,10 +1691,11 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --disable-web2c do not build the web2c (TeX & Co.) package - --enable-auto-core cause TeX&MF to dump core, given a certain filename - --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --enable-auto-core cause TeX&MF to dump core, given a certain + filename + --disable-dump-share make fmt/base/mem files architecture-dependent + --enable-fmtutil use fmtutil for build dumps + --enable-ipc enable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --enable-omega compile and install Omega @@ -1699,19 +1703,18 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX --enable-xetex compile and install XeTeX - --disable-mf do not build METAFONT + --disable-mf do not build METAFONT --enable-mf-nowin build a separate non-windows-capable METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support --enable-nextwin include NeXT window support --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (this is not X) window - support + --enable-suntoolswin include old Suntools (not X) window support --enable-tektronixwin include Tektronix window support --enable-unitermwin include Uniterm window support - --disable-mp do not build METAPOST - --disable-web-progs do not build WEB programs bibtex ... weave + --disable-mp do not build METAPOST + --disable-web-progs do not build WEB programs bibtex ... weave --enable-one build the one (testing) package --disable-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -1725,6 +1728,8 @@ Optional Features: --disable-dvipdfm do not build the dvipdfm package --disable-dvipdfmx do not build the dvipdfmx package --disable-dvipng do not build the dvipng package + --disable-debug Compile without debug (-d) option + --enable-timing Output execution time of dvipng --disable-dvipos do not build the dvipos package --disable-dvipsk do not build the dvipsk package --disable-gsftopk do not build the gsftopk package @@ -1778,6 +1783,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --with-mf-x-toolkit Use X toolkit for METAFONT + --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -2326,7 +2332,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - ## ac/withenable.ac ## utils/ac/withenable.ac @@ -2865,6 +2870,25 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } +## texk/dvipng/ac/dvipng.ac +## configure options for dvipng +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +fi + +# Check whether --enable-timing was given. +if test "${enable_timing+set}" = set; then + enableval=$enable_timing; +fi + + +# Check whether --with-gs was given. +if test "${with_gs+set}" = set; then + withval=$with_gs; +fi + + ## texk/dvipos/ac/withenable.ac ## configure options and TL libraries required for dvipos @@ -2961,7 +2985,7 @@ test "x$enable_lcdf_typetools" = xno || { } ## texk/lcdf-typetools/ac/lcdf-typetools.ac -## configure options for lcdf-typetools.ac +## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then enableval=$enable_cfftot1; @@ -5817,13 +5841,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:5820: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5844: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5823: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5847: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5826: output\"" >&5) + (eval echo "\"\$as_me:5850: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7029,7 +7053,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7032 "configure"' > conftest.$ac_ext + echo '#line 7056 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9076,11 +9100,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:9079: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9103: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9083: \$? = $ac_status" >&5 + echo "$as_me:9107: \$? = $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. @@ -9415,11 +9439,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:9418: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9442: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9422: \$? = $ac_status" >&5 + echo "$as_me:9446: \$? = $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. @@ -9520,11 +9544,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:9523: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9547: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9527: \$? = $ac_status" >&5 + echo "$as_me:9551: \$? = $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 @@ -9575,11 +9599,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:9578: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9602: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9582: \$? = $ac_status" >&5 + echo "$as_me:9606: \$? = $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 @@ -12375,7 +12399,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12378 "configure" +#line 12402 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12471,7 +12495,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12474 "configure" +#line 12498 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18867,11 +18891,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:18870: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18894: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18874: \$? = $ac_status" >&5 + echo "$as_me:18898: \$? = $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. @@ -18966,11 +18990,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:18969: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18993: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18973: \$? = $ac_status" >&5 + echo "$as_me:18997: \$? = $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 @@ -19018,11 +19042,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:19021: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19045: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19025: \$? = $ac_status" >&5 + echo "$as_me:19049: \$? = $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 @@ -25161,7 +25185,13 @@ fi if test "x$cross_compiling" = xyes; then - msg_compiling="cross-compiling on $build" + if test "x$build" = x; then + { { $as_echo "$as_me:$LINENO: error: when cross-compiling you must specify both --host and --build." >&5 +$as_echo "$as_me: error: when cross-compiling you must specify both --host and --build." >&2;} + { (exit 1); exit 1; }; } +fi + + msg_compiling="cross-compiling on $build" else msg_compiling="compiling" fi diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 5c4c6b07b8f..d0071c906a5 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -94,7 +94,9 @@ AC_CONFIG_FILES([Makefile]) AC_OUTPUT AS_IF([test "x$cross_compiling" = xyes], - [msg_compiling="cross-compiling on $build"], + [AS_IF([test "x$build" = x], + [AC_MSG_ERROR([when cross-compiling you must specify both --host and --build.])]) + msg_compiling="cross-compiling on $build"], [msg_compiling="compiling"]) AC_MSG_RESULT([ ** Configuration summary for $PACKAGE_STRING: diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 7bff066a725..ed13538ad7f 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../texk/dvipdfm/ac/withenable.ac \ $(top_srcdir)/../texk/dvipdfmx/ac/withenable.ac \ $(top_srcdir)/../texk/dvipng/ac/withenable.ac \ + $(top_srcdir)/../texk/dvipng/ac/dvipng.ac \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 38b510ce46a..80e19245bb9 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -719,6 +719,9 @@ enable_dviljk enable_dvipdfm enable_dvipdfmx enable_dvipng +enable_debug +enable_timing +with_gs enable_dvipos enable_dvipsk enable_gsftopk @@ -1429,10 +1432,11 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --disable-web2c do not build the web2c (TeX & Co.) package - --enable-auto-core cause TeX&MF to dump core, given a certain filename - --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --enable-auto-core cause TeX&MF to dump core, given a certain + filename + --disable-dump-share make fmt/base/mem files architecture-dependent + --enable-fmtutil use fmtutil for build dumps + --enable-ipc enable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --enable-omega compile and install Omega @@ -1440,19 +1444,18 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX --enable-xetex compile and install XeTeX - --disable-mf do not build METAFONT + --disable-mf do not build METAFONT --enable-mf-nowin build a separate non-windows-capable METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support --enable-nextwin include NeXT window support --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (this is not X) window - support + --enable-suntoolswin include old Suntools (not X) window support --enable-tektronixwin include Tektronix window support --enable-unitermwin include Uniterm window support - --disable-mp do not build METAPOST - --disable-web-progs do not build WEB programs bibtex ... weave + --disable-mp do not build METAPOST + --disable-web-progs do not build WEB programs bibtex ... weave --enable-one build the one (testing) package --disable-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -1466,6 +1469,8 @@ Optional Features: --disable-dvipdfm do not build the dvipdfm package --disable-dvipdfmx do not build the dvipdfmx package --disable-dvipng do not build the dvipng package + --disable-debug Compile without debug (-d) option + --enable-timing Output execution time of dvipng --disable-dvipos do not build the dvipos package --disable-dvipsk do not build the dvipsk package --disable-gsftopk do not build the gsftopk package @@ -1511,6 +1516,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --with-mf-x-toolkit Use X toolkit for METAFONT + --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -2038,7 +2044,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - ## ac/withenable.ac ## utils/ac/withenable.ac @@ -2577,6 +2582,25 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } +## texk/dvipng/ac/dvipng.ac +## configure options for dvipng +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +fi + +# Check whether --enable-timing was given. +if test "${enable_timing+set}" = set; then + enableval=$enable_timing; +fi + + +# Check whether --with-gs was given. +if test "${with_gs+set}" = set; then + withval=$with_gs; +fi + + ## texk/dvipos/ac/withenable.ac ## configure options and TL libraries required for dvipos @@ -2673,7 +2697,7 @@ test "x$enable_lcdf_typetools" = xno || { } ## texk/lcdf-typetools/ac/lcdf-typetools.ac -## configure options for lcdf-typetools.ac +## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then enableval=$enable_cfftot1; diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index 5a8581effc0..a4bcc01e432 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -16,7 +16,9 @@ # configure option --without-PKG for programs # library dependencies for programs and libraries AC_DEFUN([KPSE_SETUP], -[m4_define([kpse_TL], [$1]) +[m4_define([kpse_TL], [$1])[]dnl +m4_define([kpse_indent_26], [28])[]dnl +m4_define([kpse_indent_28], [30])[]dnl KPSE_WEB2C_PREPARE m4_sinclude(kpse_TL[ac/withenable.ac]) m4_sinclude(kpse_TL[utils/ac/withenable.ac]) diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4 index ae505566efd..831d60b0404 100644 --- a/Build/source/m4/kpse-web2c.m4 +++ b/Build/source/m4/kpse-web2c.m4 @@ -20,7 +20,7 @@ m4_define([KPSE_WITH_MKTEX], AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1-default], m4_if($2, [yes], [do not ])[run $1 if $3 missing], - [30]))[]dnl + kpse_indent_28))[]dnl AS_CASE([$enable_$1_default], [yes|no], , [enable_$1_default=$2])[]dnl ]) # KPSE_WITH_MKTEX @@ -44,7 +44,7 @@ m4_define([KPSE_WITH_XTEX], AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1], m4_if($2, [yes], [do not ])[compile and install $4], - [30]))[]dnl + kpse_indent_28))[]dnl AS_CASE([$enable_$1], [yes|no], , [enable_$1=$2])[]dnl m4_ifval([$5], [ @@ -69,7 +69,7 @@ m4_define([KPSE_WITH_MFWIN], [AC_ARG_ENABLE([$1win], AS_HELP_STRING([--enable-$1win], [include $3 window support], - [30]))[]dnl + kpse_indent_28))[]dnl ]) # KPSE_WITH_MFWIN # KPSE_MFWIN_DEFINE(WINDOW, DEFINE, TEXT) diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 6909160581b..d1788e85cf1 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../texk/dvipdfm/ac/withenable.ac \ $(top_srcdir)/../texk/dvipdfmx/ac/withenable.ac \ $(top_srcdir)/../texk/dvipng/ac/withenable.ac \ + $(top_srcdir)/../texk/dvipng/ac/dvipng.ac \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index d27defa3361..49b4ceba5c2 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -719,6 +719,9 @@ enable_dviljk enable_dvipdfm enable_dvipdfmx enable_dvipng +enable_debug +enable_timing +with_gs enable_dvipos enable_dvipsk enable_gsftopk @@ -1449,10 +1452,11 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --disable-web2c do not build the web2c (TeX & Co.) package - --enable-auto-core cause TeX&MF to dump core, given a certain filename - --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --enable-auto-core cause TeX&MF to dump core, given a certain + filename + --disable-dump-share make fmt/base/mem files architecture-dependent + --enable-fmtutil use fmtutil for build dumps + --enable-ipc enable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --enable-omega compile and install Omega @@ -1460,19 +1464,18 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX --enable-xetex compile and install XeTeX - --disable-mf do not build METAFONT + --disable-mf do not build METAFONT --enable-mf-nowin build a separate non-windows-capable METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support --enable-nextwin include NeXT window support --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (this is not X) window - support + --enable-suntoolswin include old Suntools (not X) window support --enable-tektronixwin include Tektronix window support --enable-unitermwin include Uniterm window support - --disable-mp do not build METAPOST - --disable-web-progs do not build WEB programs bibtex ... weave + --disable-mp do not build METAPOST + --disable-web-progs do not build WEB programs bibtex ... weave --enable-one build the one (testing) package --disable-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -1486,6 +1489,8 @@ Optional Features: --disable-dvipdfm do not build the dvipdfm package --disable-dvipdfmx do not build the dvipdfmx package --disable-dvipng do not build the dvipng package + --disable-debug Compile without debug (-d) option + --enable-timing Output execution time of dvipng --disable-dvipos do not build the dvipos package --disable-dvipsk do not build the dvipsk package --disable-gsftopk do not build the gsftopk package @@ -1531,6 +1536,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --with-mf-x-toolkit Use X toolkit for METAFONT + --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -2058,7 +2064,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - ## ac/withenable.ac ## utils/ac/withenable.ac @@ -2597,6 +2602,25 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } +## texk/dvipng/ac/dvipng.ac +## configure options for dvipng +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +fi + +# Check whether --enable-timing was given. +if test "${enable_timing+set}" = set; then + enableval=$enable_timing; +fi + + +# Check whether --with-gs was given. +if test "${with_gs+set}" = set; then + withval=$with_gs; +fi + + ## texk/dvipos/ac/withenable.ac ## configure options and TL libraries required for dvipos @@ -2693,7 +2717,7 @@ test "x$enable_lcdf_typetools" = xno || { } ## texk/lcdf-typetools/ac/lcdf-typetools.ac -## configure options for lcdf-typetools.ac +## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then enableval=$enable_cfftot1; diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 5c65a7fa2c3..ea8b86f8fba 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -81,7 +81,32 @@ LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) ## Rebuild libz @ZLIB_RULE@ +info_TEXINFOS = dvipng.texi +dvipng_TEXINFOS = readme.texi install.texi macros.texi dvipng.help + dist_man1_MANS = dvipng.1 +dvipng.1: dvipng.texi readme.texi + $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ + sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod + pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ + dvipng.pod > dvipng.1 + rm dvipng.pod + +## Make sure INSTALL and README exist +## +EXTRA_DIST = ChangeLog.0 ChangeLog.TL INSTALL README RELEASE + +INSTALL: install.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + +README: readme.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + +dist_noinst_SCRIPTS = texi2pod.pl if have_gif @@ -98,25 +123,11 @@ endif have_gif ## Not yet used ## -EXTRA_DIST = \ - ChangeLog.0 \ - ChangeLog.TL \ - RELEASE \ - dvipng.dvi \ - dvipng.help \ - dvipng.info \ - dvipng.texi \ - install.texi \ - macros.texi \ - miktex.h \ - miktex.mak \ - readme.texi \ - test_dvipng.tex +EXTRA_DIST += test_dvipng.tex -EXTRA_DIST += \ - dvipng.dvi.orig \ - dvipng.help.orig \ - dvipng.info.orig +## Not used +## +EXTRA_DIST += miktex.h miktex.mak ## Original files from dvipng-$(DVIPNG_VERSION) ## @@ -139,7 +150,7 @@ EXTRA_DIST += \ ## Eventually use these macro files ## -EXTRA_DIST += m4/gs-device.m4 m4/makeinfo.m4 +EXTRA_DIST += m4/gs-device.m4 ## Eventually delete these files ## diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 8810b572655..71740d4ba88 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,12 +39,14 @@ bin_PROGRAMS = dvipng$(EXEEXT) @have_ft2_or_t1_TRUE@am__append_3 = enc.c fontmap.c tfm.c subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ + $(dist_noinst_SCRIPTS) $(dvipng_TEXINFOS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ - $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ + $(srcdir)/../../build-aux/missing \ + $(srcdir)/../../build-aux/texinfo.tex $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ @@ -52,7 +55,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ ../../build-aux/ylwrap COPYING COPYING.LESSER ChangeLog \ INSTALL ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/makeinfo.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-gd-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ @@ -64,7 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/ac/dvipng.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -72,7 +76,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \ + "$(DESTDIR)$(man1dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am__dvipng_SOURCES_DIST = color.c commands.h draw.c dvi.c dvipng.c \ @@ -90,6 +95,7 @@ am_dvipng_OBJECTS = color.$(OBJEXT) draw.$(OBJEXT) dvi.$(OBJEXT) \ dvipng_OBJECTS = $(am_dvipng_OBJECTS) dvipng_LDADD = $(LDADD) am__DEPENDENCIES_1 = +SCRIPTS = $(dist_noinst_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -104,6 +110,25 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(dvipng_SOURCES) DIST_SOURCES = $(am__dvipng_SOURCES_DIST) +INFO_DEPS = $(srcdir)/dvipng.info +TEXINFO_TEX = $(top_srcdir)/../../build-aux/texinfo.tex +am__TEXINFO_TEX_DIR = $(top_srcdir)/../../build-aux +DVIS = dvipng.dvi +PDFS = dvipng.pdf +PSS = dvipng.ps +HTMLS = dvipng.html +TEXINFOS = dvipng.texi +TEXI2DVI = texi2dvi +TEXI2PDF = $(TEXI2DVI) --pdf --batch +MAKEINFOHTML = $(MAKEINFO) --html +AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) +DVIPS = dvips +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) @@ -123,6 +148,7 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_MAKEINFOFLAGS = @AM_MAKEINFOFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -154,6 +180,7 @@ GD_LIBS = @GD_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_INFO = @INSTALL_INFO@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -290,11 +317,11 @@ dvipng_DEPENDENCIES = $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) \ $(GD_DEPEND) $(T1LIB_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(GD_LIBS) $(T1LIB_LIBS) \ $(LIBPNG_LIBS) $(ZLIB_LIBS) +info_TEXINFOS = dvipng.texi +dvipng_TEXINFOS = readme.texi install.texi macros.texi dvipng.help dist_man1_MANS = dvipng.1 -EXTRA_DIST = ChangeLog.0 ChangeLog.TL RELEASE dvipng.dvi dvipng.help \ - dvipng.info dvipng.texi install.texi macros.texi miktex.h \ - miktex.mak readme.texi test_dvipng.tex dvipng.dvi.orig \ - dvipng.help.orig dvipng.info.orig \ +EXTRA_DIST = ChangeLog.0 ChangeLog.TL INSTALL README RELEASE \ + test_dvipng.tex miktex.h miktex.mak \ Makefile.in-$(DVIPNG_VERSION) aclocal.m4-$(DVIPNG_VERSION) \ color.c-$(DVIPNG_VERSION) config.h.in-$(DVIPNG_VERSION) \ configure-$(DVIPNG_VERSION) configure.ac-$(DVIPNG_VERSION) \ @@ -302,15 +329,15 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.TL RELEASE dvipng.dvi dvipng.help \ ft.c-$(DVIPNG_VERSION) misc.c-$(DVIPNG_VERSION) \ pk.c-$(DVIPNG_VERSION) set.c-$(DVIPNG_VERSION) \ special.c-$(DVIPNG_VERSION) t1.c-$(DVIPNG_VERSION) \ - tfm.c-$(DVIPNG_VERSION) m4/gs-device.m4 m4/makeinfo.m4 \ - Makefile.in.orig acinclude.m4.orig configure.ac.orig \ - Makefile.am.demo Makefile.in.work configure.ac.demo \ - configure.ac.work + tfm.c-$(DVIPNG_VERSION) m4/gs-device.m4 Makefile.in.orig \ + acinclude.m4.orig configure.ac.orig Makefile.am.demo \ + Makefile.in.work configure.ac.demo configure.ac.work +dist_noinst_SCRIPTS = texi2pod.pl all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -447,6 +474,144 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt + +.texi.info: + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + am__cwd=`pwd` && cd $(srcdir) && \ + rm -rf $$backupdir && mkdir $$backupdir && \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ + done; \ + else :; fi && \ + cd "$$am__cwd"; \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $@ $<; \ + then \ + rc=0; \ + cd $(srcdir); \ + else \ + rc=$$?; \ + cd $(srcdir) && \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ + fi; \ + rm -rf $$backupdir; exit $$rc + +.texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2DVI) $< + +.texi.pdf: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2PDF) $< + +.texi.html: + rm -rf $(@:.html=.htp) + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $(@:.html=.htp) $<; \ + then \ + rm -rf $@; \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + else \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + exit 1; \ + fi +$(srcdir)/dvipng.info: dvipng.texi $(dvipng_TEXINFOS) +dvipng.dvi: dvipng.texi $(dvipng_TEXINFOS) +dvipng.pdf: dvipng.texi $(dvipng_TEXINFOS) +dvipng.html: dvipng.texi $(dvipng_TEXINFOS) +.dvi.ps: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(DVIPS) -o $@ $< + +uninstall-dvi-am: + @$(NORMAL_UNINSTALL) + @list='$(DVIS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ + rm -f "$(DESTDIR)$(dvidir)/$$f"; \ + done + +uninstall-html-am: + @$(NORMAL_UNINSTALL) + @list='$(HTMLS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-info-am: + @$(PRE_UNINSTALL) + @if test -d '$(DESTDIR)$(infodir)' && \ + (install-info --version && \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ + install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ + done; \ + else :; fi + @$(NORMAL_UNINSTALL) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ + (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ + else :; fi); \ + done + +uninstall-pdf-am: + @$(NORMAL_UNINSTALL) + @list='$(PDFS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ + done + +uninstall-ps-am: + @$(NORMAL_UNINSTALL) + @list='$(PSS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ + rm -f "$(DESTDIR)$(psdir)/$$f"; \ + done + +dist-info: $(INFO_DEPS) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; \ + for base in $$list; do \ + case $$base in \ + $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$base; then d=.; else d=$(srcdir); fi; \ + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ + else :; fi; \ + done; \ + done + +mostlyclean-aminfo: + -rm -rf dvipng.aux dvipng.cp dvipng.cps dvipng.fn dvipng.ky dvipng.log \ + dvipng.pg dvipng.tmp dvipng.toc dvipng.tp dvipng.tps \ + dvipng.vr dvipng.dvi dvipng.pdf dvipng.ps dvipng.html + +maintainer-clean-aminfo: + @list='$(INFO_DEPS)'; for i in $$list; do \ + i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ + echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ + done install-man1: $(dist_man1_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @@ -556,6 +721,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-info -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -661,9 +829,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) config.h +all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(SCRIPTS) $(MANS) config.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -706,34 +874,109 @@ distclean-am: clean-am distclean-compile distclean-generic \ dvi: dvi-am -dvi-am: +dvi-am: $(DVIS) html: html-am +html-am: $(HTMLS) + info: info-am -info-am: +info-am: $(INFO_DEPS) -install-data-am: install-man +install-data-am: install-info-am install-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am +install-dvi-am: $(DVIS) + @$(NORMAL_INSTALL) + test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" + @list='$(DVIS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \ + done install-exec-am: install-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-am +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ + else \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + fi; \ + done install-info: install-info-am +install-info-am: $(INFO_DEPS) + @$(NORMAL_INSTALL) + test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ + if test -f $$ifile; then \ + relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ + echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \ + $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \ + else : ; fi; \ + done; \ + done + @$(POST_INSTALL) + @if (install-info --version && \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ + done; \ + else : ; fi install-man: install-man1 install-pdf: install-pdf-am +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ + done install-ps: install-ps-am +install-ps-am: $(PSS) + @$(NORMAL_INSTALL) + test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" + @list='$(PSS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \ + done installcheck-am: maintainer-clean: maintainer-clean-am @@ -741,22 +984,25 @@ maintainer-clean: maintainer-clean-am -rm -rf $(top_srcdir)/autom4te.cache -rm -rf ./$(DEPDIR) -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-aminfo \ + maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool +mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf: pdf-am -pdf-am: +pdf-am: $(PDFS) ps: ps-am -ps-am: +ps-am: $(PSS) -uninstall-am: uninstall-binPROGRAMS uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-man uninstall-pdf-am \ + uninstall-ps-am @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook @@ -767,8 +1013,8 @@ uninstall-man: uninstall-man1 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool ctags dist \ - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-compile \ + dist-all dist-bzip2 dist-gzip dist-info dist-lzma dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -778,11 +1024,13 @@ uninstall-man: uninstall-man1 install-info install-info-am install-man install-man1 \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ + maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic mostlyclean mostlyclean-aminfo \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-hook uninstall-man \ - uninstall-man1 + uninstall-binPROGRAMS uninstall-dvi-am uninstall-hook \ + uninstall-html-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-pdf-am uninstall-ps-am @KPATHSEA_RULE@ @@ -791,6 +1039,22 @@ uninstall-man: uninstall-man1 @T1LIB_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ +dvipng.1: dvipng.texi readme.texi + $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ + sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod + pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ + dvipng.pod > dvipng.1 + rm dvipng.pod + +INSTALL: install.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + +README: readme.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< @have_gif_TRUE@install-exec-hook: @have_gif_TRUE@ cd $(DESTDIR)/$(bindir) && rm -f dvigif && $(LN_S) dvipng dvigif diff --git a/Build/source/texk/dvipng/Makefile.in.work b/Build/source/texk/dvipng/Makefile.in.work index 0319f984460..c4cf3c5426c 100644 --- a/Build/source/texk/dvipng/Makefile.in.work +++ b/Build/source/texk/dvipng/Makefile.in.work @@ -1,27 +1,11 @@ #************************************************************************ -CC = @CC@ CFLAGS = @CFLAGS@ -Wall -CPPFLAGS = @CPPFLAGS@ -I. -LN_S = @LN_S@ -MAKEINFO=@MAKEINFO@ @MAKEINFO_MACROS@ -INSTALL_INFO=@INSTALL_INFO@ -TEX=tex -TEXIDVI=texi2dvi TEXIHTML=texi2html -DVIPS=dvips -TEXIFILES = dvipng.texi readme.texi install.texi macros.texi dvipng.help all: dvipng docs -####################################### The program - -dvipng: $(objects) - $(CC) $(LDFLAGS) $(objects) -o dvipng $(LIBS) - -$(objects): dvipng.h commands.h config.h - ####################################### The documentation docs: dvipng.dvi dvipng.info @@ -54,13 +38,6 @@ dvipng_mono.html: $(TEXIFILES) dvipng.help texi2html --monolithic -nomenu -nosec_nav -o dvipng_mono.html \ -I $(srcdir) $(srcdir)/dvipng.texi -install-docs: docs - -$(MKINSTALLDIRS) $(DESTDIR)$(infodir) - for x in dvipng.info* ; do \ - $(INSTALL_DATA) $$x $(DESTDIR)$(infodir) ; \ - done - -$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) dvipng.info - ####################################### The test test: test_dvipng.dvi dvipng @@ -72,23 +49,6 @@ test_dvipng.dvi: test_dvipng.tex ####################################### Maintainer targets -INSTALL: install.texi - -$(MAKEINFO) -D rawfile --no-headers --no-validate \ - --no-number-sections \ - -I$(srcdir) $(srcdir)/install.texi --output INSTALL - -README: readme.texi - -$(MAKEINFO) -D rawfile --no-headers --no-validate \ - --no-number-sections \ - -I$(srcdir) $(srcdir)/readme.texi --output README - -dvipng.1: dvipng.texi readme.texi - texi2pod.pl -D man $(srcdir)/dvipng.texi | \ - sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod - pod2man --center="User commands" --release=$(PACKAGE_STRING)\ - dvipng.pod > dvipng.1 - rm dvipng.pod - dist: INSTALL README dvipng.1 distclean # SunOS make suffix rule wierdness diff --git a/Build/source/texk/dvipng/ac/dvipng.ac b/Build/source/texk/dvipng/ac/dvipng.ac new file mode 100644 index 00000000000..b1b8c1ac0a7 --- /dev/null +++ b/Build/source/texk/dvipng/ac/dvipng.ac @@ -0,0 +1,14 @@ +## texk/dvipng/ac/dvipng.ac +## configure options for dvipng +m4_define_default([kpse_indent_26], [26])[]dnl +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--disable-debug], + [Compile without debug (-d) option], + kpse_indent_26)) +AC_ARG_ENABLE([timing], + AC_HELP_STRING([--enable-timing], + [Output execution time of dvipng], + kpse_indent_26)) +AC_ARG_WITH([gs], + AC_HELP_STRING([--with-gs=/PATH/TO/gs], + [Hard-wire the location of GhostScript])) diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac index 8057c1c85dd..7dd79a2f509 100644 --- a/Build/source/texk/dvipng/ac/withenable.ac +++ b/Build/source/texk/dvipng/ac/withenable.ac @@ -1,3 +1,4 @@ ## texk/dvipng/ac/withenable.ac ## configure options and TL libraries required for dvipng KPSE_WITH_PROG([dvipng], [kpathsea freetype2 gd t1lib]) +m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac]) diff --git a/Build/source/texk/dvipng/aclocal.m4 b/Build/source/texk/dvipng/aclocal.m4 index 76f6312e0a6..c3200e27794 100644 --- a/Build/source/texk/dvipng/aclocal.m4 +++ b/Build/source/texk/dvipng/aclocal.m4 @@ -904,6 +904,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/makeinfo.m4]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-gd-flags.m4]) diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in index 771c509968d..5a2c42edf82 100644 --- a/Build/source/texk/dvipng/config.h.in +++ b/Build/source/texk/dvipng/config.h.in @@ -11,6 +11,9 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA +/* Define as 1 to get the debug (-d) option. */ +#undef DEBUG + /* Define as the path to GhostScript. */ #undef GS_PATH @@ -61,6 +64,9 @@ /* Define to 1 if you have freetype2. */ #undef HAVE_FT2 +/* Define to 1 if you have the `ftime' function. */ +#undef HAVE_FTIME + /* Define to 1 if you have the `FT_Library_Version' function. */ #undef HAVE_FT_LIBRARY_VERSION @@ -88,6 +94,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + /* Define to 1 if you have the `getwd' function. */ #undef HAVE_GETWD @@ -284,6 +293,9 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME +/* Define as 1 to get execution time output. */ +#undef TIMING + /* Version number of package */ #undef VERSION diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 216e5a07218..c3e450ff5f0 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -820,6 +820,8 @@ KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS KPATHSEA_INCLUDES +INSTALL_INFO +AM_MAKEINFOFLAGS POW_LIB LIBOBJS ALLOCA @@ -942,6 +944,9 @@ enable_dependency_tracking with_gnu_ld enable_libtool_lock enable_largefile +enable_debug +enable_timing +with_gs with_system_kpathsea with_kpathsea_includes with_kpathsea_libdir @@ -1610,6 +1615,8 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files + --disable-debug Compile without debug (-d) option + --enable-timing Output execution time of dvipng Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1617,6 +1624,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -4235,13 +4243,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:4238: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4246: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4241: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4249: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4244: output\"" >&5) + (eval echo "\"\$as_me:4252: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5447,7 +5455,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5450 "configure"' > conftest.$ac_ext + echo '#line 5458 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7494,11 +7502,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:7497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7505: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7501: \$? = $ac_status" >&5 + echo "$as_me:7509: \$? = $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. @@ -7833,11 +7841,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:7836: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7844: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7840: \$? = $ac_status" >&5 + echo "$as_me:7848: \$? = $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. @@ -7938,11 +7946,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:7941: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7949: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7945: \$? = $ac_status" >&5 + echo "$as_me:7953: \$? = $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 @@ -7993,11 +8001,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:7996: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8004: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8000: \$? = $ac_status" >&5 + echo "$as_me:8008: \$? = $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 @@ -10793,7 +10801,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10796 "configure" +#line 10804 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10889,7 +10897,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10892 "configure" +#line 10900 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12894,6 +12902,43 @@ _ACEOF fi +## texk/dvipng/ac/dvipng.ac +## configure options for dvipng +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +fi + +# Check whether --enable-timing was given. +if test "${enable_timing+set}" = set; then + enableval=$enable_timing; +fi + + +# Check whether --with-gs was given. +if test "${with_gs+set}" = set; then + withval=$with_gs; +fi + + + +if test "x$enable_debug" != xno; then + enable_debug=yes + +cat >>confdefs.h <<\_ACEOF +#define DEBUG 1 +_ACEOF + +fi + +if test "x$enable_timing" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define TIMING 1 +_ACEOF + +fi + cat >>confdefs.h <<_ACEOF #define GS_PATH "gs" @@ -16407,6 +16452,215 @@ fi done +if test "x$enable_timing" = xyes; then + + +for ac_func in ftime gettimeofday +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +fi + +# Extract the first word of "makeinfo", so it can be a program name with args. +set dummy makeinfo; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MAKEINFO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $MAKEINFO in + [\\/]* | ?:[\\/]*) + ac_cv_path_MAKEINFO="$MAKEINFO" # 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_MAKEINFO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO=":" + ;; +esac +fi +MAKEINFO=$ac_cv_path_MAKEINFO +if test -n "$MAKEINFO"; then + { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5 +$as_echo "$MAKEINFO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +for ac_macro in acronym env option; do + if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then + { $as_echo "$as_me:$LINENO: checking if $MAKEINFO understands @$ac_macro{}" >&5 +$as_echo_n "checking if $MAKEINFO understands @$ac_macro{}... " >&6; } + echo \\\\input texinfo > conftest.texi + echo @$ac_macro{test} >> conftest.texi + if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS" + + fi + rm -f conftest.texi conftest.info +fi + +done + + +# Extract the first word of "install-info", so it can be a program name with args. +set dummy install-info; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INSTALL_INFO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $INSTALL_INFO in + [\\/]* | ?:[\\/]*) + ac_cv_path_INSTALL_INFO="$INSTALL_INFO" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH /usr/sbin /sbin +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_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_INSTALL_INFO" && ac_cv_path_INSTALL_INFO=":" + ;; +esac +fi +INSTALL_INFO=$ac_cv_path_INSTALL_INFO +if test -n "$INSTALL_INFO"; then + { $as_echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 +$as_echo "$INSTALL_INFO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -19062,7 +19316,6 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS - DVIPNG_VERSION=1.12 diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 74f452faf70..724086829f5 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -43,6 +43,17 @@ AC_CONFIG_MACRO_DIR([../../m4]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([dvipng]) +m4_include([ac/dvipng.ac]) + +if test "x$enable_debug" != xno; then + enable_debug=yes + AC_DEFINE([DEBUG], 1, [Define as 1 to get the debug (-d) option.]) +fi + +if test "x$enable_timing" = xyes; then + AC_DEFINE([TIMING], 1, [Define as 1 to get execution time output.]) +fi + dnl Checks for programs. dnl FIXME AC_DEFINE_UNQUOTED([GS_PATH], ["gs"], [Define as the path to GhostScript.]) @@ -74,6 +85,15 @@ AC_FUNC_STRTOD AC_FUNC_VPRINTF AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr]) +if test "x$enable_timing" = xyes; then + AC_CHECK_FUNCS([ftime gettimeofday]) +fi + +dnl Documentation-related checks. +AC_PATH_PROG([MAKEINFO], [makeinfo], [:]) +MAKEINFO_CHECK_MACROS([acronym env option]) +AC_PATH_PROG([INSTALL_INFO], [install-info], [:], [$PATH /usr/sbin /sbin]) + KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS @@ -83,7 +103,7 @@ KPSE_FREETYPE2_FLAGS dnl We have to check properties of libraries, either installed (system) dnl libraries or unistalled (possibly libtool) ones from the TL tree. -dnl Thus we can not use, e.g., AC_CHECK_LIB(LIB,FUNCTION) +dnl Thus we can not use, e.g., AC_CHECK_LIB(LIB, FUNCTION) dnl Checks for more libraries. KPSE_ADD_FLAGS([zlib]) @@ -144,11 +164,6 @@ AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes]) KPSE_RESTORE_FLAGS -dnl These are still missing: -dnl HAVE_FTIME -dnl HAVE_GETTIMEOFDAY -dnl HAVE_KPSE_ENC_FORMATS - DVIPNG_VERSION=dvipng_version AC_SUBST([DVIPNG_VERSION]) diff --git a/Build/source/texk/dvipng/configure.ac.work b/Build/source/texk/dvipng/configure.ac.work index 7a0795f1592..ed645fa2a89 100644 --- a/Build/source/texk/dvipng/configure.ac.work +++ b/Build/source/texk/dvipng/configure.ac.work @@ -4,18 +4,6 @@ AC_INIT([dvipng], [1.12], [dvipng@nongnu.org]) AC_CONFIG_SRCDIR([dvipng.c]) -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--disable-debug],[Compile without debug (-d) option]), - [ if test "$enableval" = yes ; then - AC_DEFINE(DEBUG, 1, [Define as 1 to get the debug (-d) option.]) - fi ], - [ enable_debug="yes"; - AC_DEFINE(DEBUG, 1, [Define as 1 to get the debug (-d) option.])]) -AC_ARG_ENABLE(timing, - AC_HELP_STRING([--enable-timing],[Output execution time of dvipng]), - [ if test "$enableval" = yes ; then - AC_DEFINE(TIMING, 1, [Define as 1 to get execution time output.]) - fi ]) # Checks for programs. AC_SET_MAKE @@ -46,14 +34,7 @@ AC_ARG_WITH(gs, # Checks for library functions. -if test "$enable_timing" = "yes"; then - AC_CHECK_FUNCS([ftime gettimeofday]) -fi - # Documentation-related checks -AC_PATH_PROG(MAKEINFO, makeinfo, :) -MAKEINFO_CHECK_MACROS(acronym env option) -AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH /usr/sbin /sbin) # SELFAUTO AC_ARG_ENABLE(selfauto-set, diff --git a/Build/source/texk/dvipng/dvipng.1 b/Build/source/texk/dvipng/dvipng.1 index 7bc3889a947..8be241151b2 100644 --- a/Build/source/texk/dvipng/dvipng.1 +++ b/Build/source/texk/dvipng/dvipng.1 @@ -132,7 +132,7 @@ .\" ======================================================================== .\" .IX Title "DVIPNG 1" -.TH DVIPNG 1 "2009-02-23" "dvipng 1.12" "User commands" +.TH DVIPNG 1 "2009-03-25" "dvipng 1.12" "User commands" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/Build/source/texk/dvipng/dvipng.dvi b/Build/source/texk/dvipng/dvipng.dvi Binary files differdeleted file mode 100644 index a9d8ba82cb3..00000000000 --- a/Build/source/texk/dvipng/dvipng.dvi +++ /dev/null diff --git a/Build/source/texk/dvipng/dvipng.dvi.orig b/Build/source/texk/dvipng/dvipng.dvi.orig Binary files differdeleted file mode 100644 index a9d8ba82cb3..00000000000 --- a/Build/source/texk/dvipng/dvipng.dvi.orig +++ /dev/null diff --git a/Build/source/texk/dvipng/dvipng.help.orig b/Build/source/texk/dvipng/dvipng.help.orig deleted file mode 100644 index ea97f477526..00000000000 --- a/Build/source/texk/dvipng/dvipng.help.orig +++ /dev/null @@ -1,42 +0,0 @@ -This is ./dvipng 1.11 Copyright 2002-2008 Jan-Ake Larsson - -Usage: ./dvipng [OPTION]... FILENAME[.dvi] -Options are chosen to be similar to dvips' options where possible: - -d # Debug (# is the debug bitmap, 1 if not given) - -D # Output resolution - -l # Last page to be output - -o f Output file, '%d' is pagenumber - -O c Image offset - -p # First page to be output - -pp #,#.. Page list to be output - -q* Quiet operation - -T c Image size (also accepts '-T bbox' and '-T tight') - -v* Verbose operation - - Interactive query of options - -These do not correspond to dvips options: - -bd # Transparent border width in dots - -bd s Transparent border fallback color (TeX-style color) - -bg s Background color (TeX-style color or 'Transparent') - --depth* Output the image depth on stdout - --dvinum* Use TeX page numbers in output filenames - -fg s Foreground color (TeX-style color) - --follow* Wait for data at end-of-file - --freetype* FreeType font rendering (default on) - --gamma # Control color interpolation - --gif Output GIF images (dvigif default) - --height* Output the image height on stdout - --noghostscript* Don't use ghostscript for PostScript specials - --nogssafer* Don't use -dSAFER in ghostscript calls - --palette* Force palette output - --picky When a warning occurs, don't output image - --png Output PNG images (dvipng default) - --strict When a warning occurs, exit - --t1lib* T1lib font rendering (default on) - --truecolor* Truecolor output - -Q # Quality (T1lib and PK subsampling) - -z # PNG compression level - - # = number f = file s = string * = suffix, '0' to turn off - c = comma-separated dimension pair (e.g., 3.2in,-32.1cm) - diff --git a/Build/source/texk/dvipng/dvipng.info b/Build/source/texk/dvipng/dvipng.info index 0b9be7c8220..731713a7518 100644 --- a/Build/source/texk/dvipng/dvipng.info +++ b/Build/source/texk/dvipng/dvipng.info @@ -1,5 +1,4 @@ -This is dvipng.info, produced by makeinfo version 4.12 from -../../../TeXlive-svn/texk/dvipng/dvipng.texi. +This is dvipng.info, produced by makeinfo version 4.12 from dvipng.texi. INFO-DIR-SECTION TeX START-INFO-DIR-ENTRY @@ -16,7 +15,7 @@ dvipng This manual documents dvipng, a program to translate a DVI (DeVice Independent) file into PNG (Portable Network Graphics). - This file documents dvipng version 1.11 + This file documents dvipng version 1.12 Corrections or perhaps rewrites of sections are _very welcome_. @@ -327,7 +326,7 @@ File: dvipng.info, Node: Option summary, Next: Option details, Up: Command-li Here is a handy summary of the options; it is printed out when you run dvipng with no arguments or with the standard `--help' option. - This is ./dvipng 1.10 Copyright 2002-2008 Jan-Ake Larsson + This is ./dvipng 1.11 Copyright 2002-2008 Jan-Ake Larsson Usage: ./dvipng [OPTION]... FILENAME[.dvi] Options are chosen to be similar to dvips' options where possible: @@ -1056,29 +1055,29 @@ Index Tag Table: -Node: Top330 -Node: Introduction1225 -Node: Installation3464 -Node: Prerequisites3811 -Node: Configure6301 -Node: Build/install8340 -Node: Installation outside the texmf tree8808 -Node: Advice for non-privileged users9515 -Node: Basic usage10523 -Node: Command-line options11650 -Node: Option summary12074 -Node: Option details14383 -Node: Graphics29762 -Node: Encapsulated PostScript30327 -Node: Bitmapped graphics31670 -Node: Color32870 -Node: Color specifications33258 -Node: Color specials34357 -Node: Diagnosing problems35769 -Node: Contact information36252 -Node: Debug options36993 -Node: Credits38028 -Node: Copying39190 -Node: Index39970 +Node: Top297 +Node: Introduction1192 +Node: Installation3431 +Node: Prerequisites3778 +Node: Configure6268 +Node: Build/install8307 +Node: Installation outside the texmf tree8775 +Node: Advice for non-privileged users9482 +Node: Basic usage10490 +Node: Command-line options11617 +Node: Option summary12041 +Node: Option details14350 +Node: Graphics29729 +Node: Encapsulated PostScript30294 +Node: Bitmapped graphics31637 +Node: Color32837 +Node: Color specifications33225 +Node: Color specials34324 +Node: Diagnosing problems35736 +Node: Contact information36219 +Node: Debug options36960 +Node: Credits37995 +Node: Copying39157 +Node: Index39937 End Tag Table diff --git a/Build/source/texk/dvipng/dvipng.info.orig b/Build/source/texk/dvipng/dvipng.info.orig deleted file mode 100644 index 0b9be7c8220..00000000000 --- a/Build/source/texk/dvipng/dvipng.info.orig +++ /dev/null @@ -1,1084 +0,0 @@ -This is dvipng.info, produced by makeinfo version 4.12 from -../../../TeXlive-svn/texk/dvipng/dvipng.texi. - -INFO-DIR-SECTION TeX -START-INFO-DIR-ENTRY -* DVI-to-PNG: (dvipng). Translating TeX DVI files to Portable Network Graphics (PNG). -* dvipng: (dvipng). A DVI-to-PNG translator. -END-INFO-DIR-ENTRY - - -File: dvipng.info, Node: Top, Next: Introduction, Up: (dir) - -dvipng -****** - -This manual documents dvipng, a program to translate a DVI (DeVice -Independent) file into PNG (Portable Network Graphics). - - This file documents dvipng version 1.11 - - Corrections or perhaps rewrites of sections are _very welcome_. - - Jan-AAke Larsson - -* Menu: - -* Introduction:: Introduction -* Installation:: How to compile and install dvipng -* Basic usage:: First things first -* Command-line options:: Advanced usage -* Graphics:: Including PostScript and/or bitmaps -* Color:: Using color with dvipng -* Diagnosing problems:: Problems? -* Credits:: People who have contributed -* Copying:: GNU Lesser General Public License -* Index:: General index - - -File: dvipng.info, Node: Introduction, Next: Installation, Prev: Top, Up: Top - -1 Introduction -************** - -This program makes PNG and/or GIF graphics from DVI files as obtained -from TeX and its relatives. - - If GIF support is enabled, GIF output is chosen by using the -`dvigif' binary or with the `--gif' option. - - It is intended to produce anti-aliased screen-resolution images as -fast as is possible. The target audience is people who need to generate -and regenerate many images again and again. The primary target is the -preview-latex (X)Emacs package, a package to preview formulas from -within (X)Emacs. Yes, you get to see your formulas in the (X)Emacs -buffer, see `http://www.gnu.org/software/auctex/preview-latex.html'. - - Another example is WeBWorK, an internet-based method for delivering -homework problems to students over the internet, giving students -instant feedback as to whether or not their answers are correct, see -`http://webwork.math.rochester.edu'. - - A more recent addition to the dvipng-using applications out there is -MediaWiki, the software behind Wikipedia and many other wikis out -there. Dvipng is used to render mathematical formulae from version -1.8.0 of MediaWiki, see `http://www.mediawiki.org'. - - Other applications may also benefit, like web applications as -latex2html and WYSIWYG editors like LyX. - - The benefits of `dvipng'/`dvigif' include - - * Speed. It is a very fast bitmap-rendering code for DVI files, which - makes it suitable for generating large amounts of images - on-the-fly, as needed in preview-latex, WeBWorK and others. - - * It does not read the postamble, so it can be started before TeX - finishes. There is a `--follow' switch that makes dvipng wait at - end-of-file for further output, unless it finds the POST marker - that indicates the end of the DVI. - - * Interactive query of options. dvipng can read options interactively - through stdin, and all options are usable. It is even possible to - change the input file through this interface. - - * Supports PK, VF, PostScript Type1, and TrueType fonts, subfonts - (i.e., as used in CJK-LaTeX), color specials, and inclusion of - PostScript, PNG, JPEG or GIF images. - - * and more... - - - -File: dvipng.info, Node: Installation, Next: Basic usage, Prev: Introduction, Up: Top - -2 Installation -************** - -Installing dvipng should be simple: merely `./configure', `make', and -`make install'. - -* Menu: - -* Prerequisites:: -* Configure:: -* Build/install:: -* Installation outside the texmf tree:: -* Advice for non-privileged users:: - - -File: dvipng.info, Node: Prerequisites, Next: Configure, Up: Installation - -2.1 Prerequisites -================= - - * The GD Graphics Draw library, libgd - - The drawing library `libgd' is necessary, and is downloadable at - `http://www.boutell.com/gd', and there are binary packages for - most operating systems from their respective distributors. In any - case, the latest version of the library installs using `autoconf' - so it should not be difficult for you to install it from source, - and then proceed with installing dvipng. - - * The path-searching library kpathsea - - Kpathsea is most likely included in your LaTeX installation, but it - may happen that ./configure does not find it; see below. If you do - not have it, download it from `http://www.ctan.org' and compile it. - I have no experience with this, so I cannot help much here. - - * The font-rendering library FreeType 2 - - While not strictly necessary, a recent FreeType 2 is recommended - since dvipng currently will produce better-quality images when - this library is available. To take advantage of this, you should - have at least FreeType 2.1.9. - - FreeType 2 will enable direct support for PostScript and TrueType - fonts, so that dvipng will not need to generate bitmapped variants - on disk of the TeX fonts since modern TeX distributions include - PostScript versions of them. Then, you can render images at - different (and unusual) resolutions without cluttering the disk - with lots of bitmapped fonts. - - Finally, it will enable subfont support in dvipng. That is, if you - want to render CJK-LaTeX characters, you must have FreeType 2 - installed. - - * The font-rendering library T1lib - - An alternative to FreeType 2 is T1lib, but this will enable only - PostScript fonts in dvipng and will not include subfont support. - Also here, you can render images at different (and unusual) - resolutions without cluttering the disk with lots of bitmapped - fonts. If both FreeType 2 and T1lib are present, FreeType will be - internally preferred by dvipng but T1lib can be chosen at runtime. - - * libpng and libz - - To be able to compress and write PNG files to disk, dvipng (or - really libgd) uses libpng which in turn uses libz. These should be - available on any modern system, if not, download them and install - them. - - * The `texinfo' package - - This is needed for building the documentation. - - -File: dvipng.info, Node: Configure, Next: Build/install, Prev: Prerequisites, Up: Installation - -2.2 Configure -============= - -The first step is to configure the source code, telling it where -various files will be. To do so, run - - ./configure OPTIONS - - (Note: if you have fetched dvipng from CVS rather than a regular -release, you will have to first generate `./configure' by running -`autoconf' 2.53 or later.) - - On many machines, you will not need to specify any options, but if -`configure' cannot determine something on its own, you'll need to help -it out. For a list of the options type - - ./configure --help - - On some machines, the libraries will be installed in directories that -are not in the linker's search path. This will generate an error when -running `./configure', indicating that it cannot find libgd or -libkpathsea (most likely). You then need to specify the path to the -respective library's object files. They are typically called e.g., -`libgd.a' or `libgd.so'. If they are located in e.g., `/sw/local/lib', -do - - ./configure LDFLAGS=-L/sw/local/lib - - If the library is available as a shared object file (`.so'), the -runtime linker may also need to be told where to find the library, then -use - - ./configure LDFLAGS='-L/sw/local/lib -R/sw/local/lib' - - When either of these is necessary, it is likely that the C header -files are also installed in directories that are not in the C -preprocessor's search path. This will also generate an error when -running `./configure', indicating that it cannot find e.g., `gd.h' or -`kpathsea.h' (most likely). You then need to specify the path to the -respective library's C header files. If they are located in e.g., -`/sw/local/include', do - - ./configure CPPFLAGS=-I/sw/local/include - - On my SUN Solaris workstation, I had to combine this into - - ./configure CPPFLAGS='-I/sw/local/include -I/sw/tex/teTeX/1.0/include'\ - LDFLAGS='-L/sw/local/lib -R/sw/local/lib -L/sw/tex/teTeX/1.0/lib/' - -where the backslash denotes a continuation of the line. - - -File: dvipng.info, Node: Build/install, Next: Installation outside the texmf tree, Prev: Configure, Up: Installation - -2.3 Build/install -================= - -Once `configure' has been run, simply enter - - make - -at the prompt to compile the C code, and build the documentation files. -To install the files into the locations chosen earlier, type - - make install - -You may need special privileges to install, e.g., if you are installing -into system directories. - - -File: dvipng.info, Node: Installation outside the texmf tree, Next: Advice for non-privileged users, Prev: Build/install, Up: Installation - -2.4 Installation outside the texmf tree -======================================= - -In some cases, a dvipng binary installed outside the texmf tree will -not be able to find virtual fonts, or the PostScript font maps -(normally used by dvips). This may be because _only_ $SELFAUTOLOC, -$SELFAUTODIR, and $SELFAUTOPARENT are used in the texmf tree -configuration file `texmf.cnf'. If so, give the switch -`--enable-selfauto-set' to `./configure'. This will make dvipng adjust -these three internally so that kpathsea thinks that dvipng _is_ -installed in the texmf tree. - - -File: dvipng.info, Node: Advice for non-privileged users, Prev: Installation outside the texmf tree, Up: Installation - -2.5 Installation for non-privileged users -========================================= - -Often people without system administration privileges want to install -software for their private use. In that case you need to specify more -options to the `configure' script, usually this is done by using the -`--prefix' option to the `configure' script, and let it point to the -personal home directory. In that way, resulting binaries will be -installed under the `bin' subdirectory of your home directory, manual -pages under `man' and so on. That way, it is reasonably easy to -maintain a bunch of additional packages, since the prefix argument is -supported by most `configure' scripts. - - You'll have to add something like `/home/myself/bin' to your `PATH' -shell variable, if it isn't there already, and similarly set the -`INFOPATH' and `MANPATH' variables to be able to access the -documentation. - - -File: dvipng.info, Node: Basic usage, Next: Command-line options, Prev: Installation, Up: Top - -3 Basic usage of dvipng -*********************** - -To use dvipng at its simplest, simply type - - dvipng foo - -where `foo.dvi' is the output of TeX that you want to convert to PNG -format. If there are four pages in `foo.dvi', those pages will be -output as `foo1.png', `foo2.png', `foo3.png', and `foo4.png', -respectively. - - If you have enabled the PostScript font support (via FreeType or -T1lib), fonts will be rendered as they are needed. Otherwise, if you -use fonts that have not been used on your system before, they may be -automatically generated; this process can take a few minutes, so -progress reports appear by default. The next time the same font is -used, it will have been saved on disk, so rendering will go much -faster. (If dvipng tries to endlessly generate the same fonts over and -over again, something is wrong. *Note Unable to generate fonts: -(kpathsea)Unable to generate fonts.) - - Many options are available (see the next section). For a brief -summary of available options, just type - - dvipng --help - - -File: dvipng.info, Node: Command-line options, Next: Graphics, Prev: Basic usage, Up: Top - -4 Command-line options -********************** - -dvipng has a plethora of command line options. Reading through this -section will give a good idea of the capabilities of the driver. - -* Menu: - -* Option summary:: Quick listing, from dvipng --help. -* Option details:: More information about each option. - - -File: dvipng.info, Node: Option summary, Next: Option details, Up: Command-line options - -4.1 Option summary -================== - -Here is a handy summary of the options; it is printed out when you run -dvipng with no arguments or with the standard `--help' option. - - This is ./dvipng 1.10 Copyright 2002-2008 Jan-Ake Larsson - - Usage: ./dvipng [OPTION]... FILENAME[.dvi] - Options are chosen to be similar to dvips' options where possible: - -d # Debug (# is the debug bitmap, 1 if not given) - -D # Output resolution - -l # Last page to be output - -o f Output file, '%d' is pagenumber - -O c Image offset - -p # First page to be output - -pp #,#.. Page list to be output - -q* Quiet operation - -T c Image size (also accepts '-T bbox' and '-T tight') - -v* Verbose operation - - Interactive query of options - - These do not correspond to dvips options: - -bd # Transparent border width in dots - -bd s Transparent border fallback color (TeX-style color) - -bg s Background color (TeX-style color or 'Transparent') - --depth* Output the image depth on stdout - --dvinum* Use TeX page numbers in output filenames - -fg s Foreground color (TeX-style color) - --follow* Wait for data at end-of-file - --freetype* FreeType font rendering (default on) - --gamma # Control color interpolation - --gif Output GIF images (dvigif default) - --height* Output the image height on stdout - --noghostscript* Don't use ghostscript for PostScript specials - --nogssafer* Don't use -dSAFER in ghostscript calls - --palette* Force palette output - --picky When a warning occurs, don't output image - --png Output PNG images (dvipng default) - --strict When a warning occurs, exit - --t1lib* T1lib font rendering (default on) - --truecolor* Truecolor output - -Q # Quality (T1lib and PK subsampling) - -z # PNG compression level - - # = number f = file s = string * = suffix, '0' to turn off - c = comma-separated dimension pair (e.g., 3.2in,-32.1cm) - - -File: dvipng.info, Node: Option details, Prev: Option summary, Up: Command-line options - -4.2 Option details -================== - -Many of the parameterless options listed here can be turned off by -suffixing the option with a zero (`0'); for instance, to turn off page -reversal, use `-r0'. Such options are marked with a trailing `*'. - -`-' - Read additional options from standard input after processing the - command line. - -`--help' - Print a usage message and exit. - -`--version' - Print the version number and exit. - -`-bd NUM' - -`-bd COLOR_SPEC' - -`-bd 'NUM COLOR_SPEC'' - Set the pixel width of the transparent border (default 0). Using - this option will make the image edges transparent, but it only - affects pixels with the background color. Giving a COLOR_SPEC will - set the fallback color, to be used in viewers that cannot handle - transparency (the default is the background color). The color spec - should be in TeX color \special syntax, e.g., 'rgb 1.0 0.0 0.0'. - Setting the fallback color makes the default border width 1 px. - *Note Color::. - -`--bdpi NUM' - Set the base (Metafont) resolution, both horizontal and vertical, - to NUM dpi (dots per inch). This option is necessary when manually - selecting Metafont mode with the -mode option (see below). - -`-bg COLOR_SPEC' - Choose background color for the images. This option will be - ignored if there is a background color \special in the DVI. The - color spec should be in TeX color \special syntax, e.g., 'rgb 1.0 - 0.0 0.0'. You can also specify 'Transparent' or 'transparent' - which will give you a transparent background with the normal - background as a fallback color. A capitalized 'Transparent' will - give a full-alpha transparency, while an all-lowercase - 'transparent' will give a simple fully transparent background with - non-transparent antialiased pixels. The latter would be suitable - for viewers who cannot cope with a true alpha channel. GIF images - do not support full alpha transparency, so in case of GIF output, - both variants will use the latter behaviour. *Note Color::. - -`-d NUM' - Set the debug flags, showing what dvipng (thinks it) is doing. - This will work unless dvipng has been compiled without the `DEBUG' - option (not recommended). Set the flags as you need them, use `-d - -1' as the first option for maximum output. *Note Debug options::. - -`-D NUM' - Set the output resolution, both horizontal and vertical, to NUM - dpi (dots per inch). - - One may want to adjust this to fit a certain text font size (e.g., - on a web page), and for a text font height of FONT_PX pixels (in - Mozilla) the correct formula is - DPI = FONT_PX * 72.27 / 10 [px * TeXpt/in / TeXpt] - The last division by ten is due to the standard font height 10pt in - your document, if you use 12pt, divide by 12. Unfortunately, some - proprietary browsers have font height in pt (points), not pixels. - You have to rescale that to pixels, using the screen resolution - (default is usually 96 dpi) which means the formula is - FONT_PX = FONT_PT * 96 / 72 [pt * px/in / (pt/in)] - On some high-res screens, the value is instead 120 dpi. Good luck! - -`--depth*' - Report the depth of the image. This only works reliably when the - LaTeX style `preview.sty' from preview-latex is used with the - `active' option. It reports the number of pixels from the bottom - of the image to the baseline of the image. This can be used for - vertical positioning of the image in, e.g., web documents, where - one would use (Cascading StyleSheets 1) - <IMG SRC="FILENAME.PNG" STYLE="vertical-align: -DEPTHpx"> - The depth is a negative offset in this case, so the minus sign is - necessary, and the unit is pixels (px). - -`--dvinum*' - Set this option to make the output page number be the TeX page - numbers rather than the physical page number. See the `-o' switch. - -`-fg COLOR_SPEC' - Choose foreground color for the images. This option will be - ignored if there is a foreground color \special in the DVI. The - color spec should be in TeX color \special syntax, e.g., 'rgb 1.0 - 0.0 0.0'. *Note Color::. - -`--follow*' - Wait for data at end-of-file. One of the benefits of dvipng is - that it does not read the postamble, so it can be started before - TeX finishes. This switch makes dvipng wait at end-of-file for - further output, unless it finds the POST marker that indicates the - end of the DVI. This is similar to `tail -f' but for DVI-to-PNG - conversion. - -`--freetype*' - Enable/disable FreeType font rendering (default on). This option is - available if the FreeType2 font library was present at compilation - time. If this is the case, dvipng will have direct support for - PostScript Type1 and TrueType fonts internally, rather than using - `gsftopk' for rendering the fonts. If you have PostScript versions - of Computer Modern installed, there will be no need to generate - bitmapped variants on disk of these. Then, you can render images - at different (and unusual) resolutions without cluttering the disk - with lots of bitmapped fonts. Note that if you have both FreeType - and T1lib on your system, FreeType will be preferred by dvipng. If - you for some reason would want to use T1lib rendering, use this - option. - -`--gamma NUM' - Control the interpolation of colors in the greyscale anti-aliasing - color palette. Default value is 1.0. For 0 < NUM < 1, the fonts - will be lighter (more like the background), and for NUM > 1, the - fonts will be darker (more like the foreground). - -`--gif*' - The images are output in the GIF format, if GIF support is enabled. - This is the default for the `dvigif' binary, which only will be - available when GIF support is enabled. GIF images are palette - images (see the `--palette' option) and does not support true alpha - channels (see the `--bg' option). See also the `--png' option. - -`--height*' - Report the height of the image. This only works reliably when the - LaTeX style `preview.sty' from preview-latex is used with the - `active' option. It reports the number of pixels from the top of - the image to the baseline of the image. The total height of the - image is obtained as the sum of the values reported from - `--height' and `--depth'. - -`-l [=]NUM' - The last page printed will be the first one numbered NUM. Default - is the last page in the document. If NUM is prefixed by an equals - sign, then it (and the argument to the `-p' option, if specified) - is treated as a physical (absolute) page number, rather than a - value to compare with the TeX `\count0' values stored in the DVI - file. Thus, using `-l =9' will end with the ninth page of the - document, no matter what the pages are actually numbered. - -`--mode MODE' - Use MODE as the Metafont device name for the PK fonts (both for - path searching and font generation). This needs to be augmented - with the base device resolution, given with the `--bdpi' option. - See the file `ftp://ftp.tug.org/tex/modes.mf' for a list of - resolutions and mode names for most devices. *Note Unable to - generate fonts: (kpathsea)Unable to generate fonts. - -`-M*' - Turns off automatic PK font generation (`mktexpk'). This will have - no effect when using PostScript fonts, since no PK font generation - will be done anyway. - -`--noghostscript*' - This switch prohibits the internal call to GhostScript for - displaying PostScript specials. `--noghostscript0' turns the call - back on. - -`--nogssafer*' - Normally, if GhostScript is used to render PostScript specials, the - GhostScript interpreter is run with the option `-dSAFER'. The - `--nogssafer' option runs GhostScript without `-dSAFER'. The - `-dSAFER' option in Ghostscript disables PostScript operators such - as deletefile, to prevent possibly malicious PostScript programs - from having any effect. - -`-o NAME' - Send output to the file NAME. A single occurrence of `%d' or - `%01d', ..., `%09d' will be exchanged for the physical page number - (this can be changed, see the `--dvinum' switch). The default - output filename is `FILE%d.png' where the input DVI file was - `FILE.dvi'. - -`-O X-OFFSET,Y-OFFSET' - Move the origin by X-OFFSET,Y-OFFSET, a comma-separated pair of - dimensions such as `.1in,-.3cm'. The origin of the page is - shifted from the default position (of one inch down, one inch to - the right from the upper left corner of the paper) by this amount. - -`-p [=]NUM' - The first page printed will be the first one numbered NUM. Default - is the first page in the document. If NUM is prefixed by an - equals sign, then it (and the argument to the `-l' option, if - specified) is treated as a physical (absolute) page number, rather - than a value to compare with the TeX `\count0' values stored in the - DVI file. Thus, using `-p =3' will start with the third page of - the document, no matter what the pages are actually numbered. - -`--palette*' - Starting from `dvipng' 1.8, the output PNG will be a truecolor png - when an external image is included, to avoid unnecessary delay and - quality reduction, and enable the EPS translator to draw on a - transparent background and outside of the boundingbox. This switch - will force palette (256-color) output and make `dvipng' revert to - the old behaviour, where included images were opaque and always - clipped to the boundingbox. This will also override the - `--truecolor' switch if present. - -`--picky*' - No images are output when a warning occurs. Normally, dvipng will - output an image in spite of a warning, but there may be something - missing in this image. One reason to use this option would be if - you have a more complete but slower fallback converter. Mainly, - this is useful for failed figure inclusion and unknown \special - occurrences, but warnings will also occur for missing or unknown - color specs and missing PK fonts. - -`--png*' - The images are output in the PNG format. This is the default for - the `dvipng' binary. See also the `--gif' option. - -`-pp FIRSTPAGE-LASTPAGE' - Print pages FIRSTPAGE through LASTPAGE; but not quite equivalent - to `-p FIRSTPAGE -l LASTPAGE'. For example, when rendering a book, - there may be several instances of a page in the DVI file (one in - `\frontmatter', one in `\mainmatter', and one in `\backmatter'). - In case of several pages matching, `-pp FIRSTPAGE-LASTPAGE' will - render _all_ pages that matches the specified range, while `-p - FIRSTPAGE -l LASTPAGE' will render the pages from the _first_ - occurrence of FIRSTPAGE to the _first_ occurrence of LASTPAGE. - This is the (undocumented) behaviour of dvips. In dvipng you can - give both kinds of options, in which case you get all pages that - matches the range in `-pp' between the pages from `-p' to `-l'. - Also multiple `-pp' options accumulate, unlike `-p' and `-l'. The - `-' separator can also be `:'. Note that `-pp -1' will be - interpreted as "all pages up to and including 1", if you want a - page numbered -1 (only the table of contents, say) put `-pp -1--1', - or more readable, `-pp -1:-1'. - -`-q*' - Run quietly. Don't chatter about pages converted, etc. to standard - output; report no warnings (only errors) to standard error. - -`-Q NUM' - Set the quality to NUM. That is, choose the number of antialiasing - levels for PK and T1lib rendering to be NUM*NUM+1. The default - value is 4 which gives 17 levels of antialiasing for antialiased - fonts from these two. If FreeType is available, its rendering is - unaffected by this option. - -`-r*' - Toggle output of pages in reverse/forward order. By default, the - first page in the DVI is output first. - -`--strict*' - The program exits when a warning occurs. Normally, dvipng will - output an image in spite of a warning, but there may be something - missing in this image. One reason to use this option would be if - you have a more complete but slower fallback converter. See the - `--picky' option above for a list of when warnings occur. - -`-T IMAGE_SIZE' - Set the image size to IMAGE_SIZE which can be either of `bbox', - `tight', or a comma-separated pair of dimensions HSIZE,VSIZE such - as `.1in,.3cm'. The default is `bbox' which produces a PNG that - includes all ink put on the page and in addition the DVI origin, - located 1in from the top and 1in from the left edge of the paper. - This usually gives whitespace above and to the left in the - produced image. The value `tight' will make dvipng only include - all ink put on the page, producing neat images. - -`--t1lib*' - Enable/disable T1lib font rendering (default on). This option is - available if the T1lib font library was present at compilation - time. If this is the case, dvipng will have direct support for - PostScript Type1 fonts internally, rather than using `gsftopk' for - rendering the fonts. If you have PostScript versions of Computer - Modern installed, there will be no need to generate bitmapped - variants on disk of these. Then, you can render images at - different (and unusual) resolutions without cluttering the disk - with lots of bitmapped fonts. Note that if you have both FreeType - and T1lib on your system FreeType will be preferred by dvipng, and - if you for some reason rather want to use T1lib, give the option - `--freetype0' (see above). - -`--truecolor*' - This will make `dvipng' generate truecolor output. Note that - truecolor output is automatic if you include an external image in - your DVI, e.g., via a PostScript special (i.e., the `graphics' or - `graphicx' package). This switch is overridden by the `--palette' - switch. - -`-v*' - Enable verbose operation. This will currently indicate what fonts - is used, in addition to the usual output. - -`-x NUM' - Set the x magnification ratio to NUM/1000. Overrides the - magnification specified in the DVI file. Must be between 10 and - 100000. It is recommended that you use standard magstep values - (1095, 1200, 1440, 1728, 2074, 2488, 2986, and so on) to help - reduce the total number of PK files generated. NUM may be a real - number, not an integer, for increased precision. - -`-z NUM' - Set the PNG compression level to NUM. This option is enabled if - your `libgd' is new enough. The default compression level is 1, - which selects maximum speed at the price of slightly larger PNGs. - For an older `libgd', the hard-soldered value 5 is used. The - include file `png.h' says - - Currently, valid values range from 0 - 9, corresponding - directly to the zlib compression levels 0 - 9 (0 - no - compression, 9 - "maximal" compression). Note that tests have - shown that zlib compression levels 3-6 usually perform as - well as level 9 for PNG images, and do considerably fewer - calculations. In the future, these values may not correspond - directly to the zlib compression levels. - - -File: dvipng.info, Node: Graphics, Next: Color, Prev: Command-line options, Up: Top - -5 Graphics -********** - -`dvipng' attempts to handle graphics as included by the `graphicx' and -`graphics' packages, without the need of specifying a driver to these -packages. This means that it recognizes the encapsulated postscript -inclusion meant for `dvips', but is also able (from version 1.8) to -include bitmapped graphics, see the details below. - -* Menu: - -* Encapsulated PostScript:: An internal call to GhostScript -* Bitmapped graphics:: PNG, JPEG and GIF - - -File: dvipng.info, Node: Encapsulated PostScript, Next: Bitmapped graphics, Up: Graphics - -5.1 Encapsulated PostScript -=========================== - -When an EPS file is included, a call to GhostScript is performed to -produce a bitmapped image that can be included. The default is to -produce an image with transparent background, at the same size as the -DVI page currently being converted to PNG, and include that as -foreground on the PNG. Of course, if the image is to be cropped, that -is done. The included image will be a truecolor image, so for maximum -performance the output PNG will be in truecolor mode as well. - - This conversion needs the `pngalpha' output device to be present in -your copy of GhostScript. If that device is not present, or you use the -`--palette' switch or request GIF output, the fallback is to use the -`png16m' device to produce a cropped opaque image for inclusion. Other -relevant switches are `--noghostscript' and `--nogssafer'. *Note Option -details::. - - The most common problem with including graphics is an incorrect -bounding box. Complain to whoever wrote the software that generated the -file if the bounding box is indeed incorrect. An adjusted boundingbox -can be specified in the `\includegraphics' call, as in this example -(using `graphicx'): - - \includegraphics[bb=10 20 100 200]{imagename.eps} - - -File: dvipng.info, Node: Bitmapped graphics, Prev: Encapsulated PostScript, Up: Graphics - -5.2 Bitmapped graphics -====================== - -dvipng can include PNG, JPEG and GIF graphics. When including such -images via `\includegraphics' you need to specify the bounding box -since TeX itself cannot read them from the files in question. The -bounding box size should be given as `0 0 w h' in pixels, e.g., if the -file `imagename.png' is 300x400 pixels, the inclusion would read - - \includegraphics[bb=0 0 300 400]{imagename.png} - - The default size is the image size in bp ("big points" in TeX -nomenclature or PostScript points as other people have it, 72 per inch). -That is, default resolution will be 72 dpi for included bitmaps, which -is the default size in the few other bitmap-capable drivers that are -known to me (dvipdfm and PDFLaTeX). - - If you want 100 dpi you need to specify the width accordingly. You -just divide your image width by 100: a 135 pixel wide image at 100 dpi -will take up 1.35 inches. If you want 200 dpi you divide by 200, and so -on. Simple, eh? The example above at 200 dpi would be 1.5 inches wide: - - \includegraphics[bb=0 0 300 400,witdh=1.5in]{imagename.png} - - -File: dvipng.info, Node: Color, Next: Diagnosing problems, Prev: Graphics, Up: Top - -6 Color -******* - -To support color, dvipng recognizes a certain set of specials as -generated by the `color' and `xcolor' style files. These specials start -with the keyword `color' or the keyword `background', followed by a -color specification. - -* Menu: - -* Color specifications:: -* Color specials:: - - -File: dvipng.info, Node: Color specifications, Next: Color specials, Up: Color - -6.1 Color specifications -======================== - -The color specification supported by dvipng is by-value or by-name. The -by-value spec starts with the name of a color model (one of `rgb', -`hsb', `cmy', `cmyk', or `gray') followed by the appropriate number of -parameters. Thus, the color specification `rgb 0.3 0.4 0.5' would -correspond to the color that is `0.3 0.4 0.5' in its red, blue and -green values. The color model used internally in dvipng is `RGB' -(discretized to 256 levels), for details on the formulas used in -conversion, see the `xcolor' documentation. - - By-name color specifications are single (case-dependent) words and -are compared with color names defined in `dvipsnam.def' (from the -`graphics' bundle), `svgnam.def' and `xcolor.sty' (from the `xcolor' -bundle). See the `xcolor' documentation for a list of names and the -corresponding colors. - - On the command-line, the name `Transparent' can also be used as an -argument to `--bg' to choose transparent background. *Note Option -details::. - - -File: dvipng.info, Node: Color specials, Prev: Color specifications, Up: Color - -6.2 Color specials -================== - -We will describe `background' first, since it is the simplest. The -`background' keyword must be followed by a color specification. That -color specification is used as a fill color for the background. The -last `background' special on a page is the one that gets used, and is -used for the whole of the page image. (This is possible because the -prescan phase of dvipng notices all of the color specials so that the -appropriate information can be written out during the second phase.) - - The `color' special itself has three forms. The first is just -`color' followed by a color specification. In this case, the current -global color is set to that color; the color stack must be empty when -such a command is executed. - - The second form is `color push' followed by a color specification. -This saves the current color on the color stack and sets the color to be -that given by the color specification. This is the most common way to -set a color. - - The final form of the `color' special is just `color pop', with no -color specification; this says to pop the color last pushed on the -color stack from the color stack and set the current color to be that -color. - - dvipng correctly handles these color specials across pages, even when -the pages are rendered repeatedly or in reverse order. - - -File: dvipng.info, Node: Diagnosing problems, Next: Credits, Prev: Color, Up: Top - -7 Diagnosing problems -********************* - -You've gone through all the trouble of installing dvipng, carefully read -all the instructions in this manual, and still can't get something to -work. The following sections provide some helpful hints if you find -yourself in such a situation. - -* Menu: - -* Contact information:: Who to ask. -* Debug options:: Getting diagnostics. - - -File: dvipng.info, Node: Contact information, Next: Debug options, Up: Diagnosing problems - -7.1 Contact information -======================= - -Bug reports should be sent to <dvipng@nongnu.org>. - - Questions, suggestions for new features, pleas for help, and/or -praise should go to <dvipng@nongnu.org>. For more information on this -mailing list, send a message with just the word `help' as subject or -body to <dvipng-request@nongnu.org> or look at -`http://lists.nongnu.org/mailman/listinfo/dvipng'. - - Offers to support further development will be appreciated. For -developer access, ask on <dvipng@nongnu.org>. - - For details on the TeX path-searching library, and `mktexpk' -problems, *note Common problems: (kpathsea)Common problems. - - -File: dvipng.info, Node: Debug options, Prev: Contact information, Up: Diagnosing problems - -7.2 Debug options -================= - -The `-d' flag to dvipng helps in tracking down certain errors. The -parameter to this flag is an integer that tells what errors are -currently being tracked. To track a certain class of debug messages, -simply provide the appropriate number given below; if you wish to track -multiple classes, sum the numbers of the classes you wish to track. To -track all classes, you can use `-1'. - - Some of these debugging options are actually provided by Kpathsea -(*note Debugging: (kpathsea)Debugging.). - - The classes are: -1 - Normal dvi op-codes - -2 - Virtual fonts - -4 - PK fonts - -8 - TFM files - -16 - Glyph rendering - -32 - FreeType calls - -64 - Encoding loads - -128 - Color specials - -256 - GhostScript specials - -512 - T1lib calls - -1024 - Kpathsea `stat' calls - -2048 - Kpathsea hash table lookups - -4096 - Kpathsea path element expansion - -8192 - Kpathsea path searches - - - -File: dvipng.info, Node: Credits, Next: Copying, Prev: Diagnosing problems, Up: Top - -8 Credits -********* - -A number of persons have contributed, if I forget to mention someone, I -apologize. First and foremost we have David Kastrup whose preview-latex -project provided the incentive to write this program. There is also a -number of people who have contributed by reporting bugs and suggesting -improvements as the thing has evolved. These include but is perhaps not -limited to (in semi-random order): Thomas Esser (teTeX), Christian -Schenk (MIKTeX), Brian R Furry (debian package), Angus Leeming (LyX), -Thomas Boutell (libgd), John Jones (first user report), Uwe Kern -(xcolor), Karl Berry (TeX Live), David Harvey (hinting in Freetype), -Neal Harmon, Alan Shutko, Reiner Stieb, Nick Alcock, Adam Buchbinder, -Svend Tollak Munkejord, James Longstreet, Bernhard Simon, Bob McElrath, -Georg Schwarz, Jason Farmer, Brian V. Smith, Samuel Hathaway, Thomas R. -Shemanske, Stephen Gibson, Christian Ridderstro"m, Ezra Peisach, -William H Wheeler, Thomas Klausner, Harald Koenig, Adrian Bunk, Kevin -Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, and Takeshi Abe. - - -File: dvipng.info, Node: Copying, Next: Index, Prev: Credits, Up: Top - -9 Copying -********* - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as published -by the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - - This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser -General Public License for more details. - - You should have received a copy of the GNU Lesser General Public -License along with this program. If not, see -<http://www.gnu.org/licenses/>. - - - -Copyright (C) 2002-2008 Jan-AAke Larsson - - -File: dvipng.info, Node: Index, Prev: Copying, Up: Top - -Index -***** - - -* Menu: - -* -dSAFER: Option details. (line 167) -* absolute page number, and -l: Option details. (line 140) -* absolute page number, and -p: Option details. (line 188) -* antialiasing levels, number of: Option details. (line 242) -* background color (option): Option details. (line 40) -* base resolution, setting: Option details. (line 35) -* baseline reporting: Option details. (line 76) -* color specifications: Color specifications. - (line 6) -* command-line options: Command-line options. - (line 6) -* compilation: Installation. (line 6) -* compression: Option details. (line 303) -* configuration, of dvipng: Installation. (line 6) -* dark fonts: Option details. (line 119) -* debugging <1>: Diagnosing problems. (line 6) -* debugging: Option details. (line 54) -* depth reporting: Option details. (line 76) -* exit on erroneous images: Option details. (line 253) -* first page printed: Option details. (line 188) -* follow mode: Option details. (line 97) -* font generation, avoiding: Option details. (line 157) -* forcing palette output: Option details. (line 197) -* foreground color (option): Option details. (line 91) -* FreeType font rendering: Option details. (line 105) -* fuzzy images: Option details. (line 119) -* gamma: Option details. (line 119) -* GhostScript and -dSAFER: Option details. (line 167) -* GhostScript, turning off: Option details. (line 162) -* GIF image format: Option details. (line 125) -* height reporting: Option details. (line 132) -* installation, of dvipng: Installation. (line 6) -* invoking dvipng: Basic usage. (line 6) -* last page printed: Option details. (line 140) -* light fonts: Option details. (line 119) -* magnification, overriding DVI: Option details. (line 295) -* Metafont mode, specifying: Option details. (line 149) -* mktexpk, avoiding: Option details. (line 157) -* mode name, specifying: Option details. (line 149) -* no erroneous images: Option details. (line 207) -* offset pages: Option details. (line 182) -* option, details of: Option details. (line 6) -* options, dvipng: Command-line options. - (line 6) -* options, reading from standard input: Option details. (line 11) -* options, summary: Option summary. (line 6) -* output resolution, setting: Option details. (line 60) -* output, redirecting: Option details. (line 175) -* page range: Option details. (line 220) -* page, first printed: Option details. (line 188) -* page, last printed: Option details. (line 140) -* physical page number, and -l: Option details. (line 140) -* physical page number, and -p: Option details. (line 188) -* PNG image format: Option details. (line 216) -* PostScript inclusion problems: Encapsulated PostScript. - (line 21) -* problems: Diagnosing problems. (line 6) -* quality: Option details. (line 242) -* quiet operation: Option details. (line 238) -* reverse pagination: Option details. (line 249) -* silent operation: Option details. (line 238) -* standard input, reading options from: Option details. (line 11) -* standard output, output to: Option details. (line 175) -* T1lib font rendering: Option details. (line 270) -* transparent border fallback color: Option details. (line 25) -* transparent border width: Option details. (line 25) -* trouble: Diagnosing problems. (line 6) -* truecolor output: Option details. (line 284) -* warnings, suppressing: Option details. (line 238) - - - -Tag Table: -Node: Top330 -Node: Introduction1225 -Node: Installation3464 -Node: Prerequisites3811 -Node: Configure6301 -Node: Build/install8340 -Node: Installation outside the texmf tree8808 -Node: Advice for non-privileged users9515 -Node: Basic usage10523 -Node: Command-line options11650 -Node: Option summary12074 -Node: Option details14383 -Node: Graphics29762 -Node: Encapsulated PostScript30327 -Node: Bitmapped graphics31670 -Node: Color32870 -Node: Color specifications33258 -Node: Color specials34357 -Node: Diagnosing problems35769 -Node: Contact information36252 -Node: Debug options36993 -Node: Credits38028 -Node: Copying39190 -Node: Index39970 - -End Tag Table diff --git a/Build/source/texk/dvipng/texi2pod.pl b/Build/source/texk/dvipng/texi2pod.pl new file mode 100755 index 00000000000..9c6d8cc2792 --- /dev/null +++ b/Build/source/texk/dvipng/texi2pod.pl @@ -0,0 +1,444 @@ +#! /usr/bin/env perl + +# Copyright (C) 1999, 2000, 2001, 2003, 2007 Free Software +# Foundation, Inc. + +# This file is part of GCC. + +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. + +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GCC. If not, see <http://www.gnu.org/licenses/>. + +# This does trivial (and I mean _trivial_) conversion of Texinfo +# markup to Perl POD format. It's intended to be used to extract +# something suitable for a manpage from a Texinfo document. + +use warnings; + +$output = 0; +$skipping = 0; +%sects = (); +$section = ""; +@icstack = (); +@endwstack = (); +@skstack = (); +@instack = (); +$shift = ""; +%defs = (); +$fnno = 1; +$inf = ""; +$ibase = ""; + +while ($_ = shift) { + if (/^-D(.*)$/) { + if ($1 ne "") { + $flag = $1; + } else { + $flag = shift; + } + $value = ""; + ($flag, $value) = ($flag =~ /^([^=]+)(?:=(.+))?/); + die "no flag specified for -D\n" + unless $flag ne ""; + die "flags may only contain letters, digits, hyphens, dashes and underscores\n" + unless $flag =~ /^[a-zA-Z0-9_-]+$/; + $defs{$flag} = $value; + } elsif (/^-/) { + usage(); + } else { + $in = $_, next unless defined $in; + $out = $_, next unless defined $out; + usage(); + } +} + +if (defined $in) { + $inf = gensym(); + open($inf, "<$in") or die "opening \"$in\": $!\n"; + $ibase = $1 if $in =~ m|^(.+)/[^/]+$|; +} else { + $inf = \*STDIN; +} + +if (defined $out) { + open(STDOUT, ">$out") or die "opening \"$out\": $!\n"; +} + +while(defined $inf) { +while(<$inf>) { + # Certain commands are discarded without further processing. + /^\@(?: + [a-z]+index # @*index: useful only in complete manual + |need # @need: useful only in printed manual + |(?:end\s+)?group # @group .. @end group: ditto + |page # @page: ditto + |node # @node: useful only in .info file + |(?:end\s+)?ifnottex # @ifnottex .. @end ifnottex: use contents + )\b/x and next; + + chomp; + + # Look for filename and title markers. + /^\@setfilename\s+([^.]+)/ and $fn = $1, next; + /^\@settitle\s+([^.]+)/ and $tl = postprocess($1), next; + + # Identify a man title but keep only the one we are interested in. + /^\@c\s+man\s+title\s+([A-Za-z0-9-]+)\s+(.+)/ and do { + if (exists $defs{$1}) { + $fn = $1; + $tl = postprocess($2); + } + next; + }; + + # Look for blocks surrounded by @c man begin SECTION ... @c man end. + # This really oughta be @ifman ... @end ifman and the like, but such + # would require rev'ing all other Texinfo translators. + /^\@c\s+man\s+begin\s+([A-Z]+)\s+([A-Za-z0-9-]+)/ and do { + $output = 1 if exists $defs{$2}; + $sect = $1; + next; + }; + /^\@c\s+man\s+begin\s+([A-Z]+)/ and $sect = $1, $output = 1, next; + /^\@c\s+man\s+end/ and do { + $sects{$sect} = "" unless exists $sects{$sect}; + $sects{$sect} .= postprocess($section); + $section = ""; + $output = 0; + next; + }; + + # handle variables + /^\@set\s+([a-zA-Z0-9_-]+)\s*(.*)$/ and do { + $defs{$1} = $2; + next; + }; + /^\@clear\s+([a-zA-Z0-9_-]+)/ and do { + delete $defs{$1}; + next; + }; + + next unless $output; + + # Discard comments. (Can't do it above, because then we'd never see + # @c man lines.) + /^\@c\b/ and next; + + # End-block handler goes up here because it needs to operate even + # if we are skipping. + /^\@end\s+([a-z]+)/ and do { + # Ignore @end foo, where foo is not an operation which may + # cause us to skip, if we are presently skipping. + my $ended = $1; + next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/; + + die "\@end $ended without \@$ended at line $.\n" unless defined $endw; + die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw; + + $endw = pop @endwstack; + + if ($ended =~ /^(?:ifset|ifclear|ignore|menu|iftex)$/) { + $skipping = pop @skstack; + next; + } elsif ($ended =~ /^(?:example|smallexample|display)$/) { + $shift = ""; + $_ = ""; # need a paragraph break + } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) { + $_ = "\n=back\n"; + $ic = pop @icstack; + } else { + die "unknown command \@end $ended at line $.\n"; + } + }; + + # We must handle commands which can cause skipping even while we + # are skipping, otherwise we will not process nested conditionals + # correctly. + /^\@ifset\s+([a-zA-Z0-9_-]+)/ and do { + push @endwstack, $endw; + push @skstack, $skipping; + $endw = "ifset"; + $skipping = 1 unless exists $defs{$1}; + next; + }; + + /^\@ifclear\s+([a-zA-Z0-9_-]+)/ and do { + push @endwstack, $endw; + push @skstack, $skipping; + $endw = "ifclear"; + $skipping = 1 if exists $defs{$1}; + next; + }; + + /^\@(ignore|menu|iftex|copying)\b/ and do { + push @endwstack, $endw; + push @skstack, $skipping; + $endw = $1; + $skipping = 1; + next; + }; + + next if $skipping; + + # Character entities. First the ones that can be replaced by raw text + # or discarded outright: + s/\@copyright\{\}/(c)/g; + s/\@dots\{\}/.../g; + s/\@enddots\{\}/..../g; + s/\@([.!? ])/$1/g; + s/\@[:-]//g; + s/\@bullet(?:\{\})?/*/g; + s/\@TeX\{\}/TeX/g; + s/\@pounds\{\}/\#/g; + s/\@minus(?:\{\})?/-/g; + s/\\,/,/g; + + # Now the ones that have to be replaced by special escapes + # (which will be turned back into text by unmunge()) + s/&/&/g; + s/\@\@/&at;/g; + s/\@\{/{/g; + s/\@\}/}/g; + + # Inside a verbatim block, handle @var specially. + if ($shift ne "") { + s/\@var\{([^\}]*)\}/<$1>/g; + } + + # POD doesn't interpret E<> inside a verbatim block. + if ($shift eq "") { + s/</</g; + s/>/>/g; + } else { + s/</</g; + s/>/>/g; + } + + # Single line command handlers. + + /^\@include\s+(.+)$/ and do { + push @instack, $inf; + $inf = gensym(); + $file = postprocess($1); + + # Try cwd and $ibase. + open($inf, "<" . $file) + or open($inf, "<" . $ibase . "/" . $file) + or die "cannot open $file or $ibase/$file: $!\n"; + next; + }; + + /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/ + and $_ = "\n=head2 $1\n"; + /^\@subsection\s+(.+)$/ + and $_ = "\n=head3 $1\n"; + + # Block command handlers: + /^\@itemize(?:\s+(\@[a-z]+|\*|-))?/ and do { + push @endwstack, $endw; + push @icstack, $ic; + if (defined $1) { + $ic = $1; + } else { + $ic = '@bullet'; + } + $_ = "\n=over 4\n"; + $endw = "itemize"; + }; + + /^\@enumerate(?:\s+([a-zA-Z0-9]+))?/ and do { + push @endwstack, $endw; + push @icstack, $ic; + if (defined $1) { + $ic = $1 . "."; + } else { + $ic = "1."; + } + $_ = "\n=over 4\n"; + $endw = "enumerate"; + }; + + /^\@([fv]?table)\s+(\@[a-z]+)/ and do { + push @endwstack, $endw; + push @icstack, $ic; + $endw = $1; + $ic = $2; + $ic =~ s/\@(?:samp|strong|key|gcctabopt|env)/B/; + $ic =~ s/\@(?:code|kbd)/C/; + $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/; + $ic =~ s/\@(?:file)/F/; + $_ = "\n=over 4\n"; + }; + + /^\@((?:small)?example|display)/ and do { + push @endwstack, $endw; + $endw = $1; + $shift = "\t"; + $_ = ""; # need a paragraph break + }; + + /^\@itemx?\s*(.+)?$/ and do { + if (defined $1) { + # Entity escapes prevent munging by the <> processing below. + $_ = "\n=item $ic\<$1\>\n"; + } else { + $_ = "\n=item $ic\n"; + $ic =~ y/A-Ya-y/B-Zb-z/; + $ic =~ s/(\d+)/$1 + 1/eg; + } + }; + + $section .= $shift.$_."\n"; +} +# End of current file. +close($inf); +$inf = pop @instack; +} + +die "No filename or title\n" unless defined $fn && defined $tl; + +$sects{NAME} = "$fn \- $tl\n"; +$sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES}; + +for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS ENVIRONMENT FILES + BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) { + if(exists $sects{$sect}) { + $head = $sect; + $head =~ s/SEEALSO/SEE ALSO/; + print "=head1 $head\n\n"; + print scalar unmunge ($sects{$sect}); + print "\n"; + } +} + +sub usage +{ + die "usage: $0 [-D toggle...] [infile [outfile]]\n"; +} + +sub postprocess +{ + local $_ = $_[0]; + + # @value{foo} is replaced by whatever 'foo' is defined as. + while (m/(\@value\{([a-zA-Z0-9_-]+)\})/g) { + if (! exists $defs{$2}) { + print STDERR "Option $2 not defined\n"; + s/\Q$1\E//; + } else { + $value = $defs{$2}; + s/\Q$1\E/$value/; + } + } + + # Formatting commands. + # Temporary escape for @r. + s/\@r\{([^\}]*)\}/R<$1>/g; + s/\@(?:dfn|var|emph|cite|i)\{([^\}]*)\}/I<$1>/g; + s/\@(?:code|kbd)\{([^\}]*)\}/C<$1>/g; + s/\@(?:gccoptlist|samp|strong|key|option|env|command|b)\{([^\}]*)\}/B<$1>/g; + s/\@sc\{([^\}]*)\}/\U$1/g; + s/\@file\{([^\}]*)\}/F<$1>/g; + s/\@w\{([^\}]*)\}/S<$1>/g; + s/\@(?:dmn|math)\{([^\}]*)\}/$1/g; + + # keep references of the form @ref{...}, print them bold + s/\@(?:ref)\{([^\}]*)\}/B<$1>/g; + + # Change double single quotes to double quotes. + s/''/"/g; + s/``/"/g; + + # Cross references are thrown away, as are @noindent and @refill. + # (@noindent is impossible in .pod, and @refill is unnecessary.) + # @* is also impossible in .pod; we discard it and any newline that + # follows it. Similarly, our macro @gol must be discarded. + + s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g; + s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g; + s/;\s+\@pxref\{(?:[^\}]*)\}//g; + s/\@noindent\s*//g; + s/\@refill//g; + s/\@gol//g; + s/\@\*\s*\n?//g; + + # @uref can take one, two, or three arguments, with different + # semantics each time. @url and @email are just like @uref with + # one argument, for our purposes. + s/\@(?:uref|url|email)\{([^\},]*)\}/<B<$1>>/g; + s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g; + s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g; + + # Un-escape <> at this point. + s/</</g; + s/>/>/g; + + # Now un-nest all B<>, I<>, R<>. Theoretically we could have + # indefinitely deep nesting; in practice, one level suffices. + 1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g; + + # Replace R<...> with bare ...; eliminate empty markup, B<>; + # shift white space at the ends of [BI]<...> expressions outside + # the expression. + s/R<([^<>]*)>/$1/g; + s/[BI]<>//g; + s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g; + s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g; + + # Extract footnotes. This has to be done after all other + # processing because otherwise the regexp will choke on formatting + # inside @footnote. + while (/\@footnote/g) { + s/\@footnote\{([^\}]+)\}/[$fnno]/; + add_footnote($1, $fnno); + $fnno++; + } + + return $_; +} + +sub unmunge +{ + # Replace escaped symbols with their equivalents. + local $_ = $_[0]; + + s/</E<lt>/g; + s/>/E<gt>/g; + s/{/\{/g; + s/}/\}/g; + s/&at;/\@/g; + s/&/&/g; + return $_; +} + +sub add_footnote +{ + unless (exists $sects{FOOTNOTES}) { + $sects{FOOTNOTES} = "\n=over 4\n\n"; + } + + $sects{FOOTNOTES} .= "=item $fnno.\n\n"; $fnno++; + $sects{FOOTNOTES} .= $_[0]; + $sects{FOOTNOTES} .= "\n\n"; +} + +# stolen from Symbol.pm +{ + my $genseq = 0; + sub gensym + { + my $name = "GEN" . $genseq++; + my $ref = \*{$name}; + delete $::{$name}; + return $ref; + } +} diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index f238c66ef69..9f4a0358568 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -16954,7 +16954,7 @@ $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} if test "x$cross_compiling" = xyes; then cache_file=/dev/null - ac_configure_args="$ac_configure_args --host='$build_alias' \ + ac_configure_args="$ac_configure_args --host='$build' \ CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'" fi diff --git a/Build/source/texk/dvipsk/configure.ac b/Build/source/texk/dvipsk/configure.ac index cd225818435..b375aefebd8 100644 --- a/Build/source/texk/dvipsk/configure.ac +++ b/Build/source/texk/dvipsk/configure.ac @@ -31,7 +31,7 @@ dnl The subdirectory squeeze must be configured for the build system. dnl Can not share the cache file with the subdirectory! AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], [cache_file=/dev/null - ac_configure_args="$ac_configure_args --host='$build_alias' \ + ac_configure_args="$ac_configure_args --host='$build' \ CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])]) diff --git a/Build/source/texk/kpathsea/ac/web2c.ac b/Build/source/texk/kpathsea/ac/web2c.ac index 488028664a2..d21e211f317 100644 --- a/Build/source/texk/kpathsea/ac/web2c.ac +++ b/Build/source/texk/kpathsea/ac/web2c.ac @@ -1,5 +1,6 @@ ## texk/kpathsea/ac/web2c.ac ## configure options for mktextmf-default & Co +m4_define_default([kpse_indent_28], [28])[]dnl m4_define([kpse_mktex_opts], [dnl [[mktexmf], [yes], [MF source], [TEX_MF]], [[mktexpk], [yes], [PK font], [TEX_PK]], diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure index 7afd50e2396..3ebf963469d 100755 --- a/Build/source/texk/kpathsea/configure +++ b/Build/source/texk/kpathsea/configure @@ -1566,13 +1566,14 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --disable-mktexmf-default do not run mktexmf if MF source missing - --disable-mktexpk-default do not run mktexpk if PK font missing - --disable-mktextfm-default 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 - --enable-mktextex-default run mktextex if TeX source missing + --disable-mktexmf-default do not run mktexmf if MF source missing + --disable-mktexpk-default do not run mktexpk if PK font missing + --disable-mktextfm-default + 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 + --enable-mktextex-default run mktextex if TeX source missing Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4181,13 +4182,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:4184: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4185: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4187: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4188: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4190: output\"" >&5) + (eval echo "\"\$as_me:4191: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5393,7 +5394,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5396 "configure"' > conftest.$ac_ext + echo '#line 5397 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7440,11 +7441,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:7443: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7444: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7447: \$? = $ac_status" >&5 + echo "$as_me:7448: \$? = $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. @@ -7779,11 +7780,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:7782: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7783: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7786: \$? = $ac_status" >&5 + echo "$as_me:7787: \$? = $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. @@ -7884,11 +7885,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:7887: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7888: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7891: \$? = $ac_status" >&5 + echo "$as_me:7892: \$? = $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 @@ -7939,11 +7940,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:7942: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7943: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7946: \$? = $ac_status" >&5 + echo "$as_me:7947: \$? = $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 @@ -10739,7 +10740,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10742 "configure" +#line 10743 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10835,7 +10836,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10838 "configure" +#line 10839 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac b/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac index 8074ab0b1df..22adc8a8b9d 100644 --- a/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac +++ b/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac @@ -1,15 +1,16 @@ ## texk/lcdf-typetools/ac/lcdf-typetools.ac -## configure options for lcdf-typetools.ac +## configure options for lcdf-typetools +m4_define_default([kpse_indent_26], [26])[]dnl m4_define([kpse_lcdf_typetools_progs], [cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42])[]dnl AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs, [AC_ARG_ENABLE(Kpse_Prog, AS_HELP_STRING([--disable-]Kpse_Prog, [do not build the ]Kpse_Prog[ program], - [28]))]) + kpse_indent_26))]) m4_define([kpse_otftotfm_auto_opts], [cfftot1 t1dotlessj updmap])[]dnl AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts, [AC_ARG_ENABLE(Kpse_Opt, AS_HELP_STRING([--disable-auto-]Kpse_Opt, [disable running ]Kpse_Opt[ from otftotfm], - [28]))]) + kpse_indent_26))]) diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 768b835fb49..0bf6d2657f4 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -1594,20 +1594,21 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --disable-cfftot1 do not build the cfftot1 program - --disable-mmafm do not build the mmafm program - --disable-mmpfb do not build the mmpfb program - --disable-otfinfo do not build the otfinfo program - --disable-otftotfm do not build the otftotfm program - --disable-t1dotlessj do not build the t1dotlessj program - --disable-t1lint do not build the t1lint program - --disable-t1rawafm do not build the t1rawafm program - --disable-t1reencode do not build the t1reencode program - --disable-t1testpage do not build the t1testpage program - --disable-ttftotype42 do not build the ttftotype42 program - --disable-auto-cfftot1 disable running cfftot1 from otftotfm - --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm - --disable-auto-updmap disable running updmap from otftotfm + --disable-cfftot1 do not build the cfftot1 program + --disable-mmafm do not build the mmafm program + --disable-mmpfb do not build the mmpfb program + --disable-otfinfo do not build the otfinfo program + --disable-otftotfm do not build the otftotfm program + --disable-t1dotlessj do not build the t1dotlessj program + --disable-t1lint do not build the t1lint program + --disable-t1rawafm do not build the t1rawafm program + --disable-t1reencode do not build the t1reencode program + --disable-t1testpage do not build the t1testpage program + --disable-ttftotype42 do not build the ttftotype42 program + --disable-auto-cfftot1 disable running cfftot1 from otftotfm + --disable-auto-t1dotlessj + disable running t1dotlessj from otftotfm + --disable-auto-updmap disable running updmap from otftotfm --enable-tetex-build build as part of a teTeX installation --disable-selfauto-set disable setting SELFAUTO variables from kpsewhich @@ -4218,13 +4219,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:4221: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4222: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4224: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4225: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4227: output\"" >&5) + (eval echo "\"\$as_me:4228: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5430,7 +5431,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5433 "configure"' > conftest.$ac_ext + echo '#line 5434 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7477,11 +7478,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:7480: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7481: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7484: \$? = $ac_status" >&5 + echo "$as_me:7485: \$? = $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. @@ -7816,11 +7817,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:7819: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7820: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7823: \$? = $ac_status" >&5 + echo "$as_me:7824: \$? = $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. @@ -7921,11 +7922,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:7924: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7925: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7928: \$? = $ac_status" >&5 + echo "$as_me:7929: \$? = $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 @@ -7976,11 +7977,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:7979: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7980: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7983: \$? = $ac_status" >&5 + echo "$as_me:7984: \$? = $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 @@ -10776,7 +10777,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10779 "configure" +#line 10780 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10872,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10875 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15891,11 +15892,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:15894: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15895: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15898: \$? = $ac_status" >&5 + echo "$as_me:15899: \$? = $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. @@ -15990,11 +15991,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:15993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15994: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15997: \$? = $ac_status" >&5 + echo "$as_me:15998: \$? = $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 @@ -16042,11 +16043,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:16045: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16046: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16049: \$? = $ac_status" >&5 + echo "$as_me:16050: \$? = $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 @@ -17570,7 +17571,7 @@ fi ## texk/lcdf-typetools/ac/lcdf-typetools.ac -## configure options for lcdf-typetools.ac +## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then enableval=$enable_cfftot1; diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index e5f0d273d1f..01c2f6ffbfb 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -1,21 +1,27 @@ ## texk/web2c/ac/web2c.ac ## configure options for TeX and MF +m4_define_default([kpse_indent_26], [26])[]dnl +m4_define_default([kpse_indent_28], [28])[]dnl AC_ARG_WITH([editor], [AS_HELP_STRING([--with-editor=CMD], [invoke CMD from the `e' option @<:@vi +%d %s@:>@])])[]dnl AC_ARG_ENABLE([auto-core], [AS_HELP_STRING([--enable-auto-core], - [cause TeX&MF to dump core, given a certain filename])])[]dnl + [cause TeX&MF to dump core, given a certain filename], + kpse_indent_26)])[]dnl AC_ARG_ENABLE([dump-share], [AS_HELP_STRING([--disable-dump-share], - [make fmt/base/mem files architecture-dependent])])[]dnl + [make fmt/base/mem files architecture-dependent], + kpse_indent_26)])[]dnl AC_ARG_ENABLE([fmtutil], [AS_HELP_STRING([--enable-fmtutil], - [use fmtutil for build dumps])])[]dnl + [use fmtutil for build dumps], + kpse_indent_26)])[]dnl ## configure options for TeX AC_ARG_ENABLE([ipc], [AS_HELP_STRING([--enable-ipc], - [enable TeX's --ipc option, i.e., pipe to a program])])[]dnl + [enable TeX's --ipc option, i.e., pipe to a program], + kpse_indent_26)])[]dnl m4_define([kpse_tex_progs], [dnl [[tex], [yes], [no], [TeX], []], [[etex], [no], [yes], [e-TeX], []], @@ -31,11 +37,12 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs], ## configure options for MF AC_ARG_ENABLE([mf], [AS_HELP_STRING([--disable-mf], - [do not build METAFONT])])[]dnl + [do not build METAFONT], + kpse_indent_26)])[]dnl AC_ARG_ENABLE([mf-nowin], [AS_HELP_STRING([--enable-mf-nowin], [build a separate non-windows-capable METAFONT], - [30])])[]dnl + kpse_indent_28)])[]dnl AC_ARG_WITH([mf-x-toolkit], [AS_HELP_STRING([--with-mf-x-toolkit], [Use X toolkit for METAFONT])])[]dnl @@ -45,7 +52,7 @@ m4_define([kpse_mf_win], [dnl [[mftalk], [MFTALK], [mftalk (generic server)]], [[next], [NEXT], [NeXT]], [[regis], [REGIS], [Regis]], -[[suntools], [SUN], [old Suntools (this is not X)]], +[[suntools], [SUN], [old Suntools (not X)]], [[tektronix], [TEKTRONIX], [Tektronix]], [[uniterm], [UNITERM], [Uniterm]], ])[]dnl @@ -55,8 +62,10 @@ m4_foreach([Kpse_Win], [kpse_mf_win], ## configure options for MP AC_ARG_ENABLE([mp], [AS_HELP_STRING([--disable-mp], - [do not build METAPOST])])[]dnl + [do not build METAPOST], + kpse_indent_26)])[]dnl ## configure options for WEB programs AC_ARG_ENABLE([web-progs], [AS_HELP_STRING([--disable-web-progs], - [do not build WEB programs bibtex ... weave])])[]dnl + [do not build WEB programs bibtex ... weave], + kpse_indent_26)])[]dnl diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index 6065acc3214..01e05b9f2e2 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -229,7 +229,7 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* metafont: Define to include old Suntools (this is not X) window support. */ +/* metafont: Define to include old Suntools (not X) window support. */ #undef SUNWIN /* metafont: Define to include Tektronix window support. */ diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index de15451d014..3702ba2c72e 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1707,24 +1707,23 @@ Optional Features: --disable-dump-share make fmt/base/mem files architecture-dependent --enable-fmtutil use fmtutil for build dumps --enable-ipc enable TeX's --ipc option, i.e., pipe to a program - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX - --enable-omega compile and install Omega - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX - --enable-xetex compile and install XeTeX + --disable-tex do not compile and install TeX + --enable-etex compile and install e-TeX + --enable-omega compile and install Omega + --disable-aleph do not compile and install Aleph + --disable-pdftex do not compile and install pdfTeX + --disable-luatex do not compile and install luaTeX + --enable-xetex compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT - --enable-epsfwin include EPSF pseudo window support - --enable-hp2627win include HP 2627 window support - --enable-mftalkwin include mftalk (generic server) window support - --enable-nextwin include NeXT window support - --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (this is not X) window - support - --enable-tektronixwin include Tektronix window support - --enable-unitermwin include Uniterm window support + --enable-mf-nowin build a separate non-windows-capable METAFONT + --enable-epsfwin include EPSF pseudo window support + --enable-hp2627win include HP 2627 window support + --enable-mftalkwin include mftalk (generic server) window support + --enable-nextwin include NeXT window support + --enable-regiswin include Regis window support + --enable-suntoolswin include old Suntools (not X) window support + --enable-tektronixwin include Tektronix window support + --enable-unitermwin include Uniterm window support --disable-mp do not build METAPOST --disable-web-progs do not build WEB programs bibtex ... weave @@ -4359,13 +4358,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:4362: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4361: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4365: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4364: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4368: output\"" >&5) + (eval echo "\"\$as_me:4367: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5571,7 +5570,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5574 "configure"' > conftest.$ac_ext + echo '#line 5573 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7618,11 +7617,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:7621: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7620: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7625: \$? = $ac_status" >&5 + echo "$as_me:7624: \$? = $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. @@ -7957,11 +7956,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:7960: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7959: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7964: \$? = $ac_status" >&5 + echo "$as_me:7963: \$? = $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. @@ -8062,11 +8061,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:8065: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8064: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8069: \$? = $ac_status" >&5 + echo "$as_me:8068: \$? = $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 @@ -8117,11 +8116,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:8120: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8119: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8124: \$? = $ac_status" >&5 + echo "$as_me:8123: \$? = $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 @@ -10917,7 +10916,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10920 "configure" +#line 10919 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11013,7 +11012,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11016 "configure" +#line 11015 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16264,11 +16263,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:16267: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16266: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16271: \$? = $ac_status" >&5 + echo "$as_me:16270: \$? = $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. @@ -16363,11 +16362,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:16366: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16365: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16370: \$? = $ac_status" >&5 + echo "$as_me:16369: \$? = $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 @@ -16415,11 +16414,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:16418: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16417: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16422: \$? = $ac_status" >&5 + echo "$as_me:16421: \$? = $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 @@ -26108,7 +26107,7 @@ $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} if test "x$cross_compiling" = xyes; then cache_file=/dev/null - ac_configure_args="$ac_configure_args --host='$build_alias' \ + ac_configure_args="$ac_configure_args --host='$build' \ CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'" fi diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index d7e2437f48f..96459d1387d 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -303,7 +303,7 @@ dnl The subdirectory web2c must be configured for the build system. dnl Can not share the cache file with the subdirectory! AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], [cache_file=/dev/null - ac_configure_args="$ac_configure_args --host='$build_alias' \ + ac_configure_args="$ac_configure_args --host='$build' \ CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])]) diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index d9687fda05e..1d1192d7c80 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../texk/dvipdfm/ac/withenable.ac \ $(top_srcdir)/../texk/dvipdfmx/ac/withenable.ac \ $(top_srcdir)/../texk/dvipng/ac/withenable.ac \ + $(top_srcdir)/../texk/dvipng/ac/dvipng.ac \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ diff --git a/Build/source/utils/configure b/Build/source/utils/configure index dc1dd7bd6d2..8d0b24c0014 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -719,6 +719,9 @@ enable_dviljk enable_dvipdfm enable_dvipdfmx enable_dvipng +enable_debug +enable_timing +with_gs enable_dvipos enable_dvipsk enable_gsftopk @@ -1426,10 +1429,11 @@ Optional Features: --disable-tpic2pdftex do not build the tpic2pdftex package --disable-vlna do not build the vlna package --disable-web2c do not build the web2c (TeX & Co.) package - --enable-auto-core cause TeX&MF to dump core, given a certain filename - --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --enable-auto-core cause TeX&MF to dump core, given a certain + filename + --disable-dump-share make fmt/base/mem files architecture-dependent + --enable-fmtutil use fmtutil for build dumps + --enable-ipc enable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --enable-omega compile and install Omega @@ -1437,19 +1441,18 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-luatex do not compile and install luaTeX --enable-xetex compile and install XeTeX - --disable-mf do not build METAFONT + --disable-mf do not build METAFONT --enable-mf-nowin build a separate non-windows-capable METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support --enable-nextwin include NeXT window support --enable-regiswin include Regis window support - --enable-suntoolswin include old Suntools (this is not X) window - support + --enable-suntoolswin include old Suntools (not X) window support --enable-tektronixwin include Tektronix window support --enable-unitermwin include Uniterm window support - --disable-mp do not build METAPOST - --disable-web-progs do not build WEB programs bibtex ... weave + --disable-mp do not build METAPOST + --disable-web-progs do not build WEB programs bibtex ... weave --enable-one build the one (testing) package --disable-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -1463,6 +1466,8 @@ Optional Features: --disable-dvipdfm do not build the dvipdfm package --disable-dvipdfmx do not build the dvipdfmx package --disable-dvipng do not build the dvipng package + --disable-debug Compile without debug (-d) option + --enable-timing Output execution time of dvipng --disable-dvipos do not build the dvipos package --disable-dvipsk do not build the dvipsk package --disable-gsftopk do not build the gsftopk package @@ -1508,6 +1513,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --with-mf-x-toolkit Use X toolkit for METAFONT + --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -2035,7 +2041,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - ## ac/withenable.ac ## utils/ac/withenable.ac @@ -2574,6 +2579,25 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } +## texk/dvipng/ac/dvipng.ac +## configure options for dvipng +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +fi + +# Check whether --enable-timing was given. +if test "${enable_timing+set}" = set; then + enableval=$enable_timing; +fi + + +# Check whether --with-gs was given. +if test "${with_gs+set}" = set; then + withval=$with_gs; +fi + + ## texk/dvipos/ac/withenable.ac ## configure options and TL libraries required for dvipos @@ -2670,7 +2694,7 @@ test "x$enable_lcdf_typetools" = xno || { } ## texk/lcdf-typetools/ac/lcdf-typetools.ac -## configure options for lcdf-typetools.ac +## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then enableval=$enable_cfftot1; |