diff options
-rw-r--r-- | Build/source/README.distro | 6 | ||||
-rwxr-xr-x | Build/source/build-aux/ylwrap | 190 | ||||
-rwxr-xr-x | Build/source/configure | 23 | ||||
-rwxr-xr-x | Build/source/libs/configure | 23 | ||||
-rw-r--r-- | Build/source/libs/icu/ChangeLog | 2 | ||||
-rwxr-xr-x | Build/source/texk/configure | 23 | ||||
-rw-r--r-- | Build/source/texk/web2c/ac/web2c.ac | 6 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 38 | ||||
-rwxr-xr-x | Build/source/utils/configure | 23 |
9 files changed, 202 insertions, 132 deletions
diff --git a/Build/source/README.distro b/Build/source/README.distro index da513e87381..ff4548bdc24 100644 --- a/Build/source/README.distro +++ b/Build/source/README.distro @@ -1,4 +1,4 @@ -Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. Building TeX Live (TL) for a distro @@ -33,8 +33,8 @@ You may specify --enable-shared to build the TL specific kpathsea and ptexenc libraries as shared libraries and may add - --disable-shared -if you don't want them as static libraries. + --disable-static +to not build the static libraries. You should use --with-system-LIB diff --git a/Build/source/build-aux/ylwrap b/Build/source/build-aux/ylwrap index 84d563405e6..7befa46de6f 100755 --- a/Build/source/build-aux/ylwrap +++ b/Build/source/build-aux/ylwrap @@ -1,10 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-07-14.08; # UTC -# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # Written by Tom Tromey <tromey@cygnus.com>. # @@ -30,9 +29,40 @@ scriptversion=2009-04-28.21; # UTC # bugs to <bug-automake@gnu.org> or send patches to # <automake-patches@gnu.org>. +get_dirname () +{ + case $1 in + */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';; + # Otherwise, we want the empty string (not "."). + esac +} + +# guard FILE +# ---------- +# The CPP macro used to guard inclusion of FILE. +guard() +{ + printf '%s\n' "$from" \ + | sed \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' +} + +# quote_for_sed [STRING] +# ---------------------- +# Return STRING (or stdin) quoted to be used as a sed pattern. +quote_for_sed () +{ + case $# in + 0) cat;; + 1) printf '%s\n' "$1";; + esac \ + | sed -e 's|[][\\.*]|\\&|g' +} + case "$1" in '') - echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 + echo "$0: No files given. Try '$0 --help' for more information." 1>&2 exit 1 ;; --basedir) @@ -67,6 +97,8 @@ esac # The input. input="$1" shift +# We'll later need for a correct munging of "#line" directives. +input_sub_rx=`get_dirname "$input" | quote_for_sed` case "$input" in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. @@ -76,15 +108,40 @@ case "$input" in input="`pwd`/$input" ;; esac +input_rx=`get_dirname "$input" | quote_for_sed` + +# Since DOS filename conventions don't allow two dots, +# the DOS version of Bison writes out y_tab.c instead of y.tab.c +# and y_tab.h instead of y.tab.h. Test to see if this is the case. +y_tab_nodot=false +if test -f y_tab.c || test -f y_tab.h; then + y_tab_nodot=true +fi -pairlist= +# The parser itself, the first file, is the destination of the .y.c +# rule in the Makefile. +parser=$1 +# A sed program to s/FROM/TO/g for all the FROM/TO so that, for +# instance, we rename #include "y.tab.h" into #include "parse.h" +# during the conversion from y.tab.c to parse.c. +rename_sed= while test "$#" -ne 0; do if test "$1" = "--"; then shift break fi - pairlist="$pairlist $1" + from=$1 + # Handle y_tab.c and y_tab.h output by DOS + if $y_tab_nodot; then + case $from in + "y.tab.c") from=y_tab.c;; + "y.tab.h") from=y_tab.h;; + esac + fi shift + to=$1 + shift + rename_sed="${rename_sed}s|"`quote_for_sed "$from"`"|$to|g;" done # The program to run. @@ -99,7 +156,11 @@ esac # FIXME: add hostname here for parallel makes that run commands on # other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ -trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 +do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' +trap "ret=129; $do_exit" 1 +trap "ret=130; $do_exit" 2 +trap "ret=141; $do_exit" 13 +trap "ret=143; $do_exit" 15 mkdir $dirname || exit 1 cd $dirname @@ -111,98 +172,55 @@ esac ret=$? if test $ret -eq 0; then - set X $pairlist - shift - first=yes - # Since DOS filename conventions don't allow two dots, - # the DOS version of Bison writes out y_tab.c instead of y.tab.c - # and y_tab.h instead of y.tab.h. Test to see if this is the case. - y_tab_nodot="no" - if test -f y_tab.c || test -f y_tab.h; then - y_tab_nodot="yes" - fi - - # The directory holding the input. - input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` - # Quote $INPUT_DIR so we can use it in a regexp. - # FIXME: really we should care about more than `.' and `\'. - input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` - - while test "$#" -ne 0; do - from="$1" - # Handle y_tab.c and y_tab.h output by DOS - if test $y_tab_nodot = "yes"; then - if test $from = "y.tab.c"; then - from="y_tab.c" - else - if test $from = "y.tab.h"; then - from="y_tab.h" - fi - fi - fi + for from in * + do + to=`printf '%s\n' "$from" | sed "$rename_sed"` if test -f "$from"; then # If $2 is an absolute path name, then just use that, - # otherwise prepend `../'. - case "$2" in - [\\/]* | ?:[\\/]*) target="$2";; - *) target="../$2";; + # otherwise prepend '../'. + case $to in + [\\/]* | ?:[\\/]*) target=$to;; + *) target="../$to";; esac - # We do not want to overwrite a header file if it hasn't - # changed. This avoid useless recompilations. However the - # parser itself (the first file) should always be updated, - # because it is the destination of the .y.c rule in the - # Makefile. Divert the output of all other files to a temporary - # file so we can compare them to existing versions. - if test $first = no; then - realtarget="$target" - target="tmp-`echo $target | sed s/.*[\\/]//g`" + # Do not overwrite unchanged header files to avoid useless + # recompilations. Always update the parser itself: it is the + # destination of the .y.c rule in the Makefile. Divert the + # output of all other files to a temporary file so we can + # compare them to existing versions. + if test $from != $parser; then + realtarget="$target" + target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` fi - # Edit out `#line' or `#' directives. - # - # We don't want the resulting debug information to point at - # an absolute srcdir; it is better for it to just mention the - # .y file with no path. - # - # We want to use the real output file name, not yy.lex.c for - # instance. - # - # We want the include guards to be adjusted too. - FROM=`echo "$from" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - TARGET=`echo "$2" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - - sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ - -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? - - # Check whether header files must be updated. - if test $first = no; then - if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then - echo "$2" is unchanged - rm -f "$target" - else - echo updating "$2" + + # Munge "#line" or "#" directives. Don't let the resulting + # debug information point at an absolute srcdir. Use the real + # output file name, not yy.lex.c for instance. Adjust the + # include guards too. + FROM=`guard "$from"` + TARGET=`guard "$to"` + sed -e "/^#/!b" -e "s|$input_rx|$input_sub_rx|" -e "$rename_sed" \ + -e "s|$FROM|$TARGET|" "$from" >"$target" || ret=$? + + # Check whether files must be updated. + if test "$from" != "$parser"; then + if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then + echo "$to is unchanged" + rm -f "$target" + else + echo "updating $to" mv -f "$target" "$realtarget" fi fi else - # A missing file is only an error for the first file. This - # is a blatant hack to let us support using "yacc -d". If -d - # is not specified, we don't want an error when the header - # file is "missing". - if test $first = yes; then + # A missing file is only an error for the parser. This is a + # blatant hack to let us support using "yacc -d". If -d is not + # specified, don't fail when the header file is "missing". + if test "$from" = "$parser"; then ret=1 fi fi - shift - shift - first=no done -else - ret=$? fi # Remove the directory. diff --git a/Build/source/configure b/Build/source/configure index baf2ca3e468..19ac957873d 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -817,6 +817,7 @@ enable_aleph enable_pdftex enable_pdftex_synctex enable_luatex +enable_mp enable_xetex enable_xetex_synctex enable_mf @@ -830,7 +831,6 @@ enable_regiswin enable_suntoolswin enable_tektronixwin enable_unitermwin -enable_mp enable_web_progs enable_afm2pl enable_bibtex8 @@ -1617,6 +1617,7 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install luaTeX + --disable-mp do not compile and install MetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -1630,7 +1631,6 @@ Optional Features: --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-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -4474,6 +4474,20 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_libpng=yes need_zziplib=yes } +# Check whether --enable-mp was given. +if test "${enable_mp+set}" = set; then : + enableval=$enable_mp; +fi +case $enable_mp in #( + yes | no) : + ;; #( + *) : + enable_mp=yes ;; +esac + +test "x$enable_web2c:$enable_mp" = xyes:yes && { + need_libpng=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; @@ -4544,11 +4558,6 @@ fi if test "${enable_unitermwin+set}" = set; then : enableval=$enable_unitermwin; fi -## configure options for MP -# Check whether --enable-mp was given. -if test "${enable_mp+set}" = set; then : - enableval=$enable_mp; -fi ## configure options for WEB programs # Check whether --enable-web-progs was given. if test "${enable_web_progs+set}" = set; then : diff --git a/Build/source/libs/configure b/Build/source/libs/configure index f4ca2d696a7..660c2f307ce 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -728,6 +728,7 @@ enable_aleph enable_pdftex enable_pdftex_synctex enable_luatex +enable_mp enable_xetex enable_xetex_synctex enable_mf @@ -741,7 +742,6 @@ enable_regiswin enable_suntoolswin enable_tektronixwin enable_unitermwin -enable_mp enable_web_progs enable_afm2pl enable_bibtex8 @@ -1516,6 +1516,7 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install luaTeX + --disable-mp do not compile and install MetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -1529,7 +1530,6 @@ Optional Features: --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-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -3668,6 +3668,20 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_libpng=yes need_zziplib=yes } +# Check whether --enable-mp was given. +if test "${enable_mp+set}" = set; then : + enableval=$enable_mp; +fi +case $enable_mp in #( + yes | no) : + ;; #( + *) : + enable_mp=yes ;; +esac + +test "x$enable_web2c:$enable_mp" = xyes:yes && { + need_libpng=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; @@ -3738,11 +3752,6 @@ fi if test "${enable_unitermwin+set}" = set; then : enableval=$enable_unitermwin; fi -## configure options for MP -# Check whether --enable-mp was given. -if test "${enable_mp+set}" = set; then : - enableval=$enable_mp; -fi ## configure options for WEB programs # Check whether --enable-web-progs was given. if test "${enable_web_progs+set}" = set; then : diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index d78bff00b03..f1b14b89ec2 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -3,7 +3,7 @@ Update icu-50.1 (release). * license.html: Update. -2012-03-03 Peter Breitenlohner <peb@mppmu.mpg.de> +2012-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> Import icu-50.1 (50_rc). * version.ac: Adjust. diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 983e64e0300..a59659437f8 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -728,6 +728,7 @@ enable_aleph enable_pdftex enable_pdftex_synctex enable_luatex +enable_mp enable_xetex enable_xetex_synctex enable_mf @@ -741,7 +742,6 @@ enable_regiswin enable_suntoolswin enable_tektronixwin enable_unitermwin -enable_mp enable_web_progs enable_afm2pl enable_bibtex8 @@ -1538,6 +1538,7 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install luaTeX + --disable-mp do not compile and install MetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -1551,7 +1552,6 @@ Optional Features: --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-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -3690,6 +3690,20 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_libpng=yes need_zziplib=yes } +# Check whether --enable-mp was given. +if test "${enable_mp+set}" = set; then : + enableval=$enable_mp; +fi +case $enable_mp in #( + yes | no) : + ;; #( + *) : + enable_mp=yes ;; +esac + +test "x$enable_web2c:$enable_mp" = xyes:yes && { + need_libpng=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; @@ -3760,11 +3774,6 @@ fi if test "${enable_unitermwin+set}" = set; then : enableval=$enable_unitermwin; fi -## configure options for MP -# Check whether --enable-mp was given. -if test "${enable_mp+set}" = set; then : - enableval=$enable_mp; -fi ## configure options for WEB programs # Check whether --enable-web-progs was given. if test "${enable_web_progs+set}" = set; then : diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index c0e76c11549..0a05bf8f6d0 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -40,6 +40,7 @@ m4_define([kpse_tex_progs], [dnl [[aleph], [yes], [], [Aleph], []], [[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng]], [[luatex], [yes], [], [luaTeX], [poppler libpng zziplib]], +[[mp], [yes], [], [MetaPost],[libpng]], [[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu-xetex teckit graphite]], ])[]dnl m4_foreach([Kpse_Prog], [kpse_tex_progs], @@ -70,11 +71,6 @@ m4_define([kpse_mf_win], [dnl m4_foreach([Kpse_Win], [kpse_mf_win], [m4_ifset([Kpse_Win], [KPSE_WITH_MFWIN(Kpse_Win)])])[]dnl -## configure options for MP -AC_ARG_ENABLE([mp], - AS_HELP_STRING([--disable-mp], - [do not build METAPOST], - kpse_indent_26))[]dnl ## configure options for WEB programs AC_ARG_ENABLE([web-progs], AS_HELP_STRING([--disable-web-progs], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 8c710f9ced7..e2c9edcc9e6 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -701,8 +701,6 @@ PWEB_FALSE PWEB_TRUE WEB_FALSE WEB_TRUE -MP_FALSE -MP_TRUE wlibs x_tool_libs x_ext_lib @@ -725,6 +723,8 @@ XETEX_SYNCTEX_FALSE XETEX_SYNCTEX_TRUE XETEX_FALSE XETEX_TRUE +MP_FALSE +MP_TRUE LUATEX_FALSE LUATEX_TRUE PDFTEX_SYNCTEX_FALSE @@ -941,6 +941,7 @@ enable_aleph enable_pdftex enable_pdftex_synctex enable_luatex +enable_mp enable_xetex enable_xetex_synctex enable_mf @@ -954,7 +955,6 @@ enable_regiswin enable_suntoolswin enable_tektronixwin enable_unitermwin -enable_mp enable_web_progs enable_missing with_fontconfig_includes @@ -1658,6 +1658,7 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install luaTeX + --disable-mp do not compile and install MetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -1671,7 +1672,6 @@ Optional Features: --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-missing terminate if a requested program or feature must be disabled, e.g., due to missing libraries @@ -17870,6 +17870,20 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_libpng=yes need_zziplib=yes } +# Check whether --enable-mp was given. +if test "${enable_mp+set}" = set; then : + enableval=$enable_mp; +fi +case $enable_mp in #( + yes | no) : + ;; #( + *) : + enable_mp=yes ;; +esac + +test "x$enable_web2c:$enable_mp" = xyes:yes && { + need_libpng=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; @@ -17940,11 +17954,6 @@ fi if test "${enable_unitermwin+set}" = set; then : enableval=$enable_unitermwin; fi -## configure options for MP -# Check whether --enable-mp was given. -if test "${enable_mp+set}" = set; then : - enableval=$enable_mp; -fi ## configure options for WEB programs # Check whether --enable-web-progs was given. if test "${enable_web_progs+set}" = set; then : @@ -19023,6 +19032,13 @@ else LUATEX_TRUE='#' LUATEX_FALSE= fi + if test "x$enable_mp" = xyes; then + MP_TRUE= + MP_FALSE='#' +else + MP_TRUE='#' + MP_FALSE= +fi if test "x$enable_xetex" = xyes; then XETEX_TRUE= XETEX_FALSE='#' @@ -23591,6 +23607,10 @@ if test -z "${LUATEX_TRUE}" && test -z "${LUATEX_FALSE}"; then as_fn_error $? "conditional \"LUATEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${MP_TRUE}" && test -z "${MP_FALSE}"; then + as_fn_error $? "conditional \"MP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${XETEX_TRUE}" && test -z "${XETEX_FALSE}"; then as_fn_error $? "conditional \"XETEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 6fa61c9e439..14c0bf68fc7 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -728,6 +728,7 @@ enable_aleph enable_pdftex enable_pdftex_synctex enable_luatex +enable_mp enable_xetex enable_xetex_synctex enable_mf @@ -741,7 +742,6 @@ enable_regiswin enable_suntoolswin enable_tektronixwin enable_unitermwin -enable_mp enable_web_progs enable_afm2pl enable_bibtex8 @@ -1514,6 +1514,7 @@ Optional Features: --disable-pdftex do not compile and install pdfTeX --disable-pdftex-synctex build pdfTeX without SyncTeX support --disable-luatex do not compile and install luaTeX + --disable-mp do not compile and install MetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -1527,7 +1528,6 @@ Optional Features: --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-afm2pl do not build the afm2pl package --disable-bibtex8 do not build the bibtex8 package @@ -3666,6 +3666,20 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && { need_libpng=yes need_zziplib=yes } +# Check whether --enable-mp was given. +if test "${enable_mp+set}" = set; then : + enableval=$enable_mp; +fi +case $enable_mp in #( + yes | no) : + ;; #( + *) : + enable_mp=yes ;; +esac + +test "x$enable_web2c:$enable_mp" = xyes:yes && { + need_libpng=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; @@ -3736,11 +3750,6 @@ fi if test "${enable_unitermwin+set}" = set; then : enableval=$enable_unitermwin; fi -## configure options for MP -# Check whether --enable-mp was given. -if test "${enable_mp+set}" = set; then : - enableval=$enable_mp; -fi ## configure options for WEB programs # Check whether --enable-web-progs was given. if test "${enable_web_progs+set}" = set; then : |