From fb2be9e6937c2fbcb4a859cf77de4e2d1fdf694b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 30 Mar 2015 12:43:04 +0000 Subject: Update build system git-svn-id: svn://tug.org/texlive/trunk@36676 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 11 +++++- Build/source/libs/configure | 11 +++++- Build/source/m4/ChangeLog | 4 ++ Build/source/m4/kpse-web2c.m4 | 73 +++++++++++++++++++++++++++--------- Build/source/texk/configure | 11 +++++- Build/source/texk/web2c/ChangeLog | 5 +++ Build/source/texk/web2c/ac/web2c.ac | 15 ++++---- Build/source/texk/web2c/configure | 48 +++++++++++++----------- Build/source/texk/web2c/configure.ac | 11 +++--- Build/source/utils/configure | 11 +++++- 10 files changed, 140 insertions(+), 60 deletions(-) (limited to 'Build/source') diff --git a/Build/source/configure b/Build/source/configure index b2c0346e3c4..a5e0493cd04 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1636,8 +1636,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 @@ -4682,6 +4682,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; diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 1bb14c3d76b..6add4525de7 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -1541,8 +1541,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 @@ -3926,6 +3926,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; diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index b10724a370e..ae96f27fc1f 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2015-03-30 Peter Breitenlohner + + * kpse-web2c.m4: Add KPSE_WITH_XMF and KPSE_XMF_COND. + 2015-03-26 Peter Breitenlohner * kpse-graphite2-flags.m4: Does not depend on other libraries. diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4 index ddc0ba67322..6fd219f671d 100644 --- a/Build/source/m4/kpse-web2c.m4 +++ b/Build/source/m4/kpse-web2c.m4 @@ -1,5 +1,5 @@ # Private macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2011 Peter Breitenlohner +# Copyright (C) 2009-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -13,12 +13,12 @@ AC_DEFUN([KPSE_WEB2C_PREPARE], []) # KPSE_WITH_XTEX(PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS) # ------------------------------------------------------------------ # Provide and normalize the configure options --enable-*tex. -m4_define([KPSE_WITH_XTEX], -[AC_ARG_ENABLE([$1], - AS_HELP_STRING([--]m4_if([$2], [yes], [dis], [en])[able-$1], - m4_if([$2], [yes], - [do not ])[compile and install $4], - kpse_indent_26))[]dnl +m4_define([KPSE_WITH_XTEX], [dnl +AC_ARG_ENABLE([$1], + AS_HELP_STRING([--]m4_if([$2], [yes], [dis], [en])[able-$1], + m4_if([$2], [yes], + [do not ])[compile and install $4], + kpse_indent_26))[]dnl AS_CASE([$enable_$1], [yes | no], , [enable_$1=$2]) @@ -38,8 +38,8 @@ AC_FOREACH([Kpse_Lib], [$5], [ need_[]AS_TR_SH(Kpse_Lib)=yes # KPSE_XTEX_COND(PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS) # ------------------------------------------------------------------ # Normalize --enable-*tex-synctex configure option and build conditionals. -m4_define([KPSE_XTEX_COND], -[AM_CONDITIONAL(AS_TR_CPP($1), [test "x$enable_$1" = xyes])[]dnl +m4_define([KPSE_XTEX_COND], [dnl +AM_CONDITIONAL(AS_TR_CPP($1), [test "x$enable_$1" = xyes])[]dnl m4_ifval([$3], [ AS_CASE([$enable_native_texlive_build:$enable_$1_synctex], [yes:$3 | no:yes | no:no], , @@ -51,21 +51,58 @@ AM_CONDITIONAL(AS_TR_CPP($1)[_SYNCTEX], [test "x$enable_$1_synctex" = xyes])[]dn ])[]dnl m4_ifval ]) # KPSE_XTEX_COND +# KPSE_WITH_XMF(PROG, BUILD-OR-NO, NOWIN-OR-NO, TEXT, REQUIRED-LIBS) +# ------------------------------------------------------------------ +# Provide and normalize the configure options --enable-mf*. +m4_define([KPSE_WITH_XMF], [dnl +AC_ARG_ENABLE([$1], + AS_HELP_STRING([--]m4_if([$2], [yes], [dis], [en])[able-$1], + m4_if([$2], [yes], + [do not ])[compile and install $4], + kpse_indent_26))[]dnl +AS_CASE([$enable_$1], + [yes | no], , + [enable_$1=$2]) +m4_ifval([$3], [ +AC_ARG_ENABLE([$1-nowin], + AS_HELP_STRING([--]m4_if([$3], [yes], [dis], [en])[able-$1-nowin], + m4_if([$3], [yes], + [do not ])[build a separate non-window-capable $4], + m4_eval(kpse_indent_26+2)))[]dnl +])[]dnl m4_ifval +m4_ifval([$5], [ +test "x$enable_web2c:$enable_$1" = xyes:yes && { +AC_FOREACH([Kpse_Lib], [$5], [ need_[]AS_TR_SH(Kpse_Lib)=yes +])} +])[]dnl m4_ifval +]) # KPSE_WITH_XMF + +# KPSE_XMF_COND(PROG, BUILD-OR-NO, NOWIN-OR-NO, TEXT, REQUIRED-LIBS) +# ------------------------------------------------------------------ +# Build conditionals and adjust with_x. +m4_define([KPSE_XMF_COND], [dnl +AM_CONDITIONAL(AS_TR_CPP($1), [test "x$enable_$1" != xno])[]dnl +test "x$enable_$1" = xyes && : ${with_x=yes} +m4_ifval([$3], [ +AM_CONDITIONAL(AS_TR_CPP($1)[N], [test "x$enable_$1_nowin" != xno])[]dnl +])[]dnl m4_ifval +]) # KPSE_XMF_COND + # KPSE_WITH_MFWIN(WINDOW, DEFINE, TEXT) # ------------------------------------- # Provide configure options --enable-*win. -m4_define([KPSE_WITH_MFWIN], -[AC_ARG_ENABLE([$1win], - AS_HELP_STRING([--enable-$1win], - [include $3 window support], - m4_eval(kpse_indent_26+2)))[]dnl +m4_define([KPSE_WITH_MFWIN], [dnl +AC_ARG_ENABLE([$1win], + AS_HELP_STRING([--enable-$1win], + [include $3 window support], + m4_eval(kpse_indent_26+2)))[]dnl ]) # KPSE_WITH_MFWIN # KPSE_MFWIN_DEFINE(WINDOW, DEFINE, TEXT) # --------------------------------------- # Defines for enable-*win -m4_define([KPSE_MFWIN_DEFINE], -[AS_IF([test "x$enable_$1win" = xyes], - [AC_DEFINE([$2WIN], , - [metafont: Define to include $3 window support.])]) +m4_define([KPSE_MFWIN_DEFINE], [dnl +AS_IF([test "x$enable_$1win" = xyes], + [AC_DEFINE([$2WIN], , + [metafont: Define to include $3 window support.])]) ]) # KPSE_MFWIN_DEFINE diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 967a9543067..e71605f3ade 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -1551,8 +1551,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 @@ -3936,6 +3936,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; diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 8ff49ad81d9..6567029932e 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2015-03-30 Peter Breitenlohner + + * ac/web2c.ac: Define kpse_mf_progs and use KPSE_WITH_XMF. + * configure.ac: Use KPSE_XMF_COND. + 2015-03-14 Peter Breitenlohner * configure.ac: Correctly locate installed . diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index e840ba8c6b1..47752afeceb 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -46,14 +46,13 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs], [m4_ifset([Kpse_Prog], [KPSE_WITH_XTEX(Kpse_Prog)])])[]dnl ## configure options for MF -AC_ARG_ENABLE([mf], - AS_HELP_STRING([--disable-mf], - [do not build METAFONT], - kpse_indent_26))[]dnl -AC_ARG_ENABLE([mf-nowin], - AS_HELP_STRING([--disable-mf-nowin], - [do not build a separate non-windows-capable METAFONT], - m4_eval(kpse_indent_26+2)))[]dnl +dnl [PROG, BUILD-OR-NO, NOWIN-OR-NO, TEXT, REQUIRED-LIBS] +m4_define([kpse_mf_progs], [dnl +[[mf], [yes], [yes], [METAFONT], []], +])[]dnl +m4_foreach([Kpse_Prog], [kpse_mf_progs], + [m4_ifset([Kpse_Prog], + [KPSE_WITH_XMF(Kpse_Prog)])])[]dnl AC_ARG_WITH([mf-x-toolkit], AS_HELP_STRING([--with-mf-x-toolkit], [use X toolkit for METAFONT]))[]dnl 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 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 8cd71cb2dcd..d26347741f9 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -153,11 +153,7 @@ AS_IF([test "x$enable_aleph:$enable_xetex:$enable_omfonts" = xno:no:yes], AM_CONDITIONAL([OTANGLE], [test "x$enable_otangle" = xyes])[]dnl -AM_CONDITIONAL([MF], [test "x$enable_mf" != xno]) -AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno]) - # Handle --with-mf-x-toolkit and --with-x -test "x$enable_mf" = xno || enable_mf=yes AS_CASE([$with_mf_x_toolkit], [yes|no], [], [''], [with_mf_x_toolkit=no], @@ -167,7 +163,12 @@ AS_CASE([$with_mf_x_toolkit], with_mf_x_toolkit=no]) 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. + +dnl Generate MF* conditionals and set with_x. +m4_foreach([Kpse_Prog], [kpse_mf_progs], + [m4_ifset([Kpse_Prog], + [KPSE_XMF_COND(Kpse_Prog)])])[]dnl +: ${with_x=yes} # Distinguish no X at all, no toolkit, or toolkit. AC_PATH_XTRA diff --git a/Build/source/utils/configure b/Build/source/utils/configure index aa8d6a96d25..27b9b9f86ee 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -1533,8 +1533,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 @@ -3918,6 +3918,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; -- cgit v1.2.3