Update build system

git-svn-id: svn://tug.org/texlive/trunk@36676 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 54 insertions, 36 deletions

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  <peb@mppmu.mpg.de>
+
+	* ac/web2c.ac: Define kpse_mf_progs and use KPSE_WITH_XMF.
+	* configure.ac: Use KPSE_XMF_COND.
+
 2015-03-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Correctly locate installed <kpathsea/paths.h>.
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