diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-30 12:43:04 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-30 12:43:04 +0000 |
commit | fb2be9e6937c2fbcb4a859cf77de4e2d1fdf694b (patch) | |
tree | aa90fe9472ccc76ca6b5a263973a7488d7e4b0b2 /Build/source/texk/web2c/configure | |
parent | 8b8d2ad6801eb57e12994d69ddaf9851aa61e0f1 (diff) |
Update build system
git-svn-id: svn://tug.org/texlive/trunk@36676 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/configure')
-rwxr-xr-x | Build/source/texk/web2c/configure | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 946db4adc41..29b3b6913c6 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1723,8 +1723,8 @@ Optional Features: --disable-upmp do not compile and install upMetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support - --disable-mf do not build METAFONT - --disable-mf-nowin do not build a separate non-windows-capable + --disable-mf do not compile and install METAFONT + --disable-mf-nowin do not build a separate non-window-capable METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support @@ -18832,6 +18832,13 @@ test "x$enable_web2c:$enable_xetex" = xyes:yes && { if test "${enable_mf+set}" = set; then : enableval=$enable_mf; fi +case $enable_mf in #( + yes | no) : + ;; #( + *) : + enable_mf=yes ;; +esac + # Check whether --enable-mf-nowin was given. if test "${enable_mf_nowin+set}" = set; then : enableval=$enable_mf_nowin; @@ -20180,25 +20187,7 @@ else OTANGLE_FALSE= fi - if test "x$enable_mf" != xno; then - MF_TRUE= - MF_FALSE='#' -else - MF_TRUE='#' - MF_FALSE= -fi - - if test "x$enable_mf_nowin" != xno; then - MFN_TRUE= - MFN_FALSE='#' -else - MFN_TRUE='#' - MFN_FALSE= -fi - - # Handle --with-mf-x-toolkit and --with-x -test "x$enable_mf" = xno || enable_mf=yes case $with_mf_x_toolkit in #( yes|no) : ;; #( @@ -20215,7 +20204,24 @@ $as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_too esac test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=$enable_mf} # tell PATH_XTRA to use X for Metafont, if not specified. + + if test "x$enable_mf" != xno; then + MF_TRUE= + MF_FALSE='#' +else + MF_TRUE='#' + MF_FALSE= +fi +test "x$enable_mf" = xyes && : ${with_x=yes} + + if test "x$enable_mf_nowin" != xno; then + MFN_TRUE= + MFN_FALSE='#' +else + MFN_TRUE='#' + MFN_FALSE= +fi +: ${with_x=yes} # Distinguish no X at all, no toolkit, or toolkit. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 |