diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-14 11:04:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-14 11:04:53 +0000 |
commit | fc55c800d99eea12af660f352754f5a464b0d674 (patch) | |
tree | ea1db0698e38299d2737957f8cdab4d643257a22 /Build/source/texk | |
parent | 562b9630efc63d20babed990a6b64e57c0f35e1f (diff) |
Minor build system updates
git-svn-id: svn://tug.org/texlive/trunk@28259 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-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 |
3 files changed, 46 insertions, 21 deletions
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 |