update build system

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

17 files changed, 299 insertions, 138 deletions

diff --git a/Build/source/Build b/Build/source/Build
index 938ab49ba8e..7e1d092fafe 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -78,6 +78,9 @@ cd $TL_WORKDIR || exit 1
 # default to static linking.
 : ${TL_CONF_SHARED=--disable-shared}
 
+# default to terminate if requested programs or features must be disabled.
+: ${TL_CONF_MISSING=--disable-missing}
+
 # default to building ICU without thread support, since xetex doesn't need it.
 : ${TL_CONF_THREADS=--disable-threads}
 
@@ -105,6 +108,7 @@ cd $TL_WORKDIR || exit 1
         --datadir=$TL_INSTALL_DEST \
         $TL_CONF_BANNER \
         $TL_CONF_SHARED \
+        $TL_CONF_MISSING \
         $TL_CONF_LARGEFILE \
         $TL_CONF_THREADS \
         $TL_CONF_XDVI_TOOLKIT \
diff --git a/Build/source/README.config b/Build/source/README.config
index 330ad3cb245..1811bdd7629 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -80,6 +80,11 @@ compiler warnings should help to resolve portability problems.
 At the moment these warning flags are only defined for the GNU compilers gcc
 and g++, but flags for other compilers could be added when needed.
 
+1.8. --disable-missing
+----------------------
+Immediately terminate the build process if a requested program or feature
+must be disabled, e.g., due to missing libraries.
+
 2. Configure options for program packages
 =========================================
 
diff --git a/Build/source/configure b/Build/source/configure
index 3badb21b4eb..24efa74ddc7 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -920,6 +920,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_missing
 enable_all_pkgs
 enable_native_texlive_build
 enable_multiplatform
@@ -1700,6 +1701,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
   --disable-all-pkgs      do not build packages unless explicitly enabled
   --disable-native-texlive-build
                           do not build for the TeX Live binary distribution
@@ -1794,7 +1797,8 @@ Optional Features:
                             do not run mktextfm if TFM file missing
   --disable-mkocp-default   do not run mkocp if OCP file missing
   --disable-mkofm-default   do not run mkofm if OFM file missing
-  --enable-mktexfmt-default run mktexfmt if format file missing
+  --disable-mktexfmt-default
+                            do not run mktexfmt if format file missing
   --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
@@ -2366,6 +2370,11 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -3524,8 +3533,9 @@ $as_echo "$as_me: Using \`kpathsea' headers and library from TL tree" >&6;}
   fi
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
-## configure options for mktextmf-default & Co
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## subdirectory texk/kpathsea.
+## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
   enableval=$enable_mktexmf_default;
@@ -3572,7 +3582,7 @@ if test "${enable_mktexfmt_default+set}" = set; then
 fi
 case $enable_mktexfmt_default in
   yes|no) : ;;
-  *) enable_mktexfmt_default=no ;;
+  *) enable_mktexfmt_default=yes ;;
 esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then
@@ -6193,13 +6203,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6196: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6206: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6199: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6209: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6202: output\"" >&5)
+  (eval echo "\"\$as_me:6212: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7405,7 +7415,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7408 "configure"' > conftest.$ac_ext
+  echo '#line 7418 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9366,11 +9376,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9379: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9373: \$? = $ac_status" >&5
+   echo "$as_me:9383: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9705,11 +9715,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9708: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9718: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9712: \$? = $ac_status" >&5
+   echo "$as_me:9722: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9810,11 +9820,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9813: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9823: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9817: \$? = $ac_status" >&5
+   echo "$as_me:9827: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9865,11 +9875,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9868: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9878: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9872: \$? = $ac_status" >&5
+   echo "$as_me:9882: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12665,7 +12675,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12668 "configure"
+#line 12678 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12761,7 +12771,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12764 "configure"
+#line 12774 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19255,11 +19265,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19258: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19268: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19262: \$? = $ac_status" >&5
+   echo "$as_me:19272: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19354,11 +19364,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19357: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19367: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19361: \$? = $ac_status" >&5
+   echo "$as_me:19371: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19406,11 +19416,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19409: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19419: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19413: \$? = $ac_status" >&5
+   echo "$as_me:19423: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20418,17 +20428,6 @@ $as_echo "$as_me: error: You could use \`--without-ln-s' to build without workin
    { (exit 1); exit 1; }; }
 fi
 
-## FIXME
-if test "x$with_fontconfig" != x; then
-  { { $as_echo "$as_me:$LINENO: error: Sorry, the configure option \`--with-fontconfig' is no longer supported.
-        Either use \`--with-fontconfig-includes' and/or \`--with-fontconfig-libdir'.
-        or (preferably) use pkg-config, if necessary setting PKG_CONFIG." >&5
-$as_echo "$as_me: error: Sorry, the configure option \`--with-fontconfig' is no longer supported.
-        Either use \`--with-fontconfig-includes' and/or \`--with-fontconfig-libdir'.
-        or (preferably) use pkg-config, if necessary setting PKG_CONFIG." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
 if test "x$mandir" = 'x${datarootdir}/man'; then
   mandir='${prefix}/texmf/doc/man'
   ac_configure_args="$ac_configure_args '--mandir=$mandir'"
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index 53e92aa737f..3ad3585a9e9 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -58,13 +58,6 @@ if test "x$LN_S" != "xln -s" && test "x$with_ln_s" != xno; then
   AC_MSG_ERROR([You could use `--without-ln-s' to build without working `ln -s'])
 fi
 
-## FIXME
-if test "x$with_fontconfig" != x; then
-  AC_MSG_ERROR([Sorry, the configure option `--with-fontconfig' is no longer supported.
-        Either use `--with-fontconfig-includes' and/or `--with-fontconfig-libdir'.
-        or (preferably) use pkg-config, if necessary setting PKG_CONFIG.])
-fi
-
 if test "x$mandir" = 'x${datarootdir}/man'; then
   mandir='${prefix}/texmf/doc/man'
   ac_configure_args="$ac_configure_args '--mandir=$mandir'"  
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 8cd05f41125..9c7f46dff50 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -681,6 +681,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_missing
 enable_all_pkgs
 enable_native_texlive_build
 enable_multiplatform
@@ -1446,6 +1447,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
   --disable-all-pkgs      do not build packages unless explicitly enabled
   --disable-native-texlive-build
                           do not build for the TeX Live binary distribution
@@ -1540,7 +1543,8 @@ Optional Features:
                             do not run mktextfm if TFM file missing
   --disable-mkocp-default   do not run mkocp if OCP file missing
   --disable-mkofm-default   do not run mkofm if OFM file missing
-  --enable-mktexfmt-default run mktexfmt if format file missing
+  --disable-mktexfmt-default
+                            do not run mktexfmt if format file missing
   --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
@@ -2079,6 +2083,11 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -3227,8 +3236,9 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
-## configure options for mktextmf-default & Co
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## subdirectory texk/kpathsea.
+## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
   enableval=$enable_mktexmf_default;
@@ -3275,7 +3285,7 @@ if test "${enable_mktexfmt_default+set}" = set; then
 fi
 case $enable_mktexfmt_default in
   yes|no) : ;;
-  *) enable_mktexfmt_default=no ;;
+  *) enable_mktexfmt_default=yes ;;
 esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 926d6cbef7c..2345634835a 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -281,6 +281,26 @@ $2])],
        [AC_MSG_ERROR([$2], m4_default([$3], 1))])
 ]) # KPSE_MSG_ERROR
 
+# KPSE_MSG_WARN(PROBLEM)
+# ----------------------
+# Same as AC_MSG_WARN, but terminate if `--disable-missing' was given.
+AC_DEFUN([KPSE_MSG_WARN],
+[AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
+AC_MSG_WARN([$1])
+AS_IF([test "x$enable_missing" = xno],
+      [AC_MSG_ERROR([terminating.])])
+]) # KPSE_MSG_WARN
+
+# _KPSE_MSG_WARN_PREPARE
+# ----------------------
+# Internal subroutine.
+AC_DEFUN([_KPSE_MSG_WARN_PREPARE],
+[AC_ARG_ENABLE([missing],
+               AS_HELP_STRING([--disable-missing],
+                              [terminate if a requested program or feature must
+                               be disabled, e.g., due to missing libraries]))[]dnl
+]) # _KPSE_MSG_WARN_PREPARE
+
 # _KPSE_CHECK_PKG_CONFIG
 # ----------------------
 # Check for pkg-config
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 9321f9a0a76..a43d3ebfd28 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -17,7 +17,8 @@
 #   additional program specific configure options (if any)
 #   library dependencies for programs and libraries
 AC_DEFUN([KPSE_SETUP],
-[m4_define([kpse_TL], [$1])[]dnl
+[AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
+m4_define([kpse_TL], [$1])[]dnl
 m4_define([kpse_indent_26], [28])[]dnl
 AC_ARG_ENABLE([all-pkgs],
               AS_HELP_STRING([--disable-all-pkgs],
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 53b1ea9038a..b20f5fee569 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -681,6 +681,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_missing
 enable_all_pkgs
 enable_native_texlive_build
 enable_multiplatform
@@ -1464,6 +1465,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
   --disable-all-pkgs      do not build packages unless explicitly enabled
   --disable-native-texlive-build
                           do not build for the TeX Live binary distribution
@@ -1558,7 +1561,8 @@ Optional Features:
                             do not run mktextfm if TFM file missing
   --disable-mkocp-default   do not run mkocp if OCP file missing
   --disable-mkofm-default   do not run mkofm if OFM file missing
-  --enable-mktexfmt-default run mktexfmt if format file missing
+  --disable-mktexfmt-default
+                            do not run mktexfmt if format file missing
   --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
@@ -2097,6 +2101,11 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -3245,8 +3254,9 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
-## configure options for mktextmf-default & Co
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## subdirectory texk/kpathsea.
+## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
   enableval=$enable_mktexmf_default;
@@ -3293,7 +3303,7 @@ if test "${enable_mktexfmt_default+set}" = set; then
 fi
 case $enable_mktexfmt_default in
   yes|no) : ;;
-  *) enable_mktexfmt_default=no ;;
+  *) enable_mktexfmt_default=yes ;;
 esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 74f45748d6f..ccb14272a48 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1061,6 +1061,7 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
+enable_missing
 with_fontconfig_includes
 with_fontconfig_libdir
 with_x
@@ -1769,6 +1770,8 @@ Optional Features:
   --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
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4568,13 +4571,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4571: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4574: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4574: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4577: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4577: output\"" >&5)
+  (eval echo "\"\$as_me:4580: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5780,7 +5783,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5783 "configure"' > conftest.$ac_ext
+  echo '#line 5786 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7741,11 +7744,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7744: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7747: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7748: \$? = $ac_status" >&5
+   echo "$as_me:7751: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8080,11 +8083,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8086: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8087: \$? = $ac_status" >&5
+   echo "$as_me:8090: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8185,11 +8188,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8188: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8191: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8192: \$? = $ac_status" >&5
+   echo "$as_me:8195: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8240,11 +8243,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8243: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8246: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8247: \$? = $ac_status" >&5
+   echo "$as_me:8250: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11040,7 +11043,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11043 "configure"
+#line 11046 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11136,7 +11139,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11139 "configure"
+#line 11142 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16250,11 +16253,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16253: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16256: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16257: \$? = $ac_status" >&5
+   echo "$as_me:16260: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16349,11 +16352,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16352: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16355: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16356: \$? = $ac_status" >&5
+   echo "$as_me:16359: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16401,11 +16404,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16407: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16408: \$? = $ac_status" >&5
+   echo "$as_me:16411: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18275,18 +18278,37 @@ fi
 fi
 
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 if test "x$enable_luatex:$enable_ipc" != xno:no; then
   case $ac_cv_search_connect in
   "none required") : ;;
   no) if test "x$enable_luatex" = xyes; then
   { $as_echo "$as_me:$LINENO: WARNING: Sorry, no socket library: can not build luaTeX" >&5
 $as_echo "$as_me: WARNING: Sorry, no socket library: can not build luaTeX" >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                              enable_luatex=no
 fi
 
                       if test "x$enable_ipc" = xyes; then
   { $as_echo "$as_me:$LINENO: WARNING: no socket library: disabling ipc" >&5
 $as_echo "$as_me: WARNING: no socket library: disabling ipc" >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                              enable_ipc=no
 fi
  ;;
@@ -18577,6 +18599,13 @@ fi
   no) if test "x$enable_luatex" = xyes; then
   { $as_echo "$as_me:$LINENO: WARNING: Sorry, no inet_aton(): can not build luaTeX" >&5
 $as_echo "$as_me: WARNING: Sorry, no inet_aton(): can not build luaTeX" >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                         enable_luatex=no
 fi
  ;;
@@ -18588,6 +18617,13 @@ esac
   no) if test "x$enable_luatex" = xyes; then
   { $as_echo "$as_me:$LINENO: WARNING: Sorry, no gethostbyname(): can not build luaTeX" >&5
 $as_echo "$as_me: WARNING: Sorry, no gethostbyname(): can not build luaTeX" >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                         enable_luatex=no
 fi
  ;;
@@ -18599,6 +18635,13 @@ esac
   no) if test "x$enable_luatex" = xyes; then
   { $as_echo "$as_me:$LINENO: WARNING: Sorry, no nanosleep(): can not build luaTeX" >&5
 $as_echo "$as_me: WARNING: Sorry, no nanosleep(): can not build luaTeX" >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                         enable_luatex=no
 fi
  ;;
@@ -18858,6 +18901,13 @@ fi
 if test "x$enable_xetex:$kpse_cv_have_Carbon:$kpse_cv_have_fontconfig" = xyes:no:no; then
   { $as_echo "$as_me:$LINENO: WARNING: Sorry, can not build XeTeX without Carbon framework or fontconfig" >&5
 $as_echo "$as_me: WARNING: Sorry, can not build XeTeX without Carbon framework or fontconfig" >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
        enable_xetex=no
 fi
 
@@ -19012,6 +19062,13 @@ case $with_mf_x_toolkit in
   n) with_mf_x_toolkit=no ;;
   *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&5
 $as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
              with_mf_x_toolkit=yes ;;
 esac
 
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 88bfce0136b..32e8f5409f8 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -81,10 +81,10 @@ AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no],
       [AS_CASE([$ac_cv_search_connect],
                ["none required"], [],
                [no], [AS_IF([test "x$enable_luatex" = xyes],
-                            [AC_MSG_WARN([Sorry, no socket library: can not build luaTeX])
+                            [KPSE_MSG_WARN([Sorry, no socket library: can not build luaTeX])
                              enable_luatex=no])
                       AS_IF([test "x$enable_ipc" = xyes],
-                            [AC_MSG_WARN([no socket library: disabling ipc])
+                            [KPSE_MSG_WARN([no socket library: disabling ipc])
                              enable_ipc=no])],
                    [socketlibs=$ac_cv_search_connect])])
 if test "x$enable_ipc" = xyes; then
@@ -105,19 +105,19 @@ if test "x$kpse_cv_have_win32" = xno; then
   AS_CASE([$ac_cv_search_inet_aton],
           ["none required"], [],
           [no], [AS_IF([test "x$enable_luatex" = xyes],
-                       [AC_MSG_WARN([Sorry, no inet_aton(): can not build luaTeX])
+                       [KPSE_MSG_WARN([Sorry, no inet_aton(): can not build luaTeX])
                         enable_luatex=no])],
               [lua_socketlibs="$lua_socketlibs $ac_cv_search_inet_aton"])
   AS_CASE([$ac_cv_search_gethostbyname],
           ["none required"], [],
           [no], [AS_IF([test "x$enable_luatex" = xyes],
-                       [AC_MSG_WARN([Sorry, no gethostbyname(): can not build luaTeX])
+                       [KPSE_MSG_WARN([Sorry, no gethostbyname(): can not build luaTeX])
                         enable_luatex=no])],
               [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"])
   AS_CASE([$ac_cv_search_nanosleep],
           ["none required"], [],
           [no], [AS_IF([test "x$enable_luatex" = xyes],
-                       [AC_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX])
+                       [KPSE_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX])
                         enable_luatex=no])],
               [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"])
 fi
@@ -127,7 +127,7 @@ AC_SUBST([ipc_socketlibs])
 KPSE_CHECK_FRAMEWORK([Carbon], [ATSUStyle style])
 KPSE_FONTCONFIG_FLAGS
 AS_IF([test "x$enable_xetex:$kpse_cv_have_Carbon:$kpse_cv_have_fontconfig" = xyes:no:no],
-      [AC_MSG_WARN([Sorry, can not build XeTeX without Carbon framework or fontconfig])
+      [KPSE_MSG_WARN([Sorry, can not build XeTeX without Carbon framework or fontconfig])
        enable_xetex=no])
 AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_Carbon" = xyes])
 AM_CONDITIONAL([XETEX_GRAPHITE], [test "x$with_graphite" != xno])
@@ -155,7 +155,7 @@ AS_CASE([$with_mf_x_toolkit],
         [''], [with_mf_x_toolkit=$enable_mf],
         [y|ye], [with_mf_x_toolkit=yes],
         [n], [with_mf_x_toolkit=no],
-            [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.])
+            [KPSE_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.])
              with_mf_x_toolkit=yes])
 test "x$with_x_toolkit" = xyes && with_x=yes
 test "x$with_x" = xno && with_x_toolkit=no
diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure
index d64a8335139..54cb3fbaf1b 100755
--- a/Build/source/texk/xdv2pdf/configure
+++ b/Build/source/texk/xdv2pdf/configure
@@ -934,6 +934,7 @@ enable_compiler_warnings
 with_system_kpathsea
 with_kpathsea_includes
 with_kpathsea_libdir
+enable_missing
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1593,6 +1594,8 @@ Optional Features:
   --enable-compiler-warnings=[no|min|yes|max]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4354,13 +4357,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4357: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4360: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4360: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4363: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4363: output\"" >&5)
+  (eval echo "\"\$as_me:4366: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5566,7 +5569,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5569 "configure"' > conftest.$ac_ext
+  echo '#line 5572 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7527,11 +7530,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7530: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7533: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7534: \$? = $ac_status" >&5
+   echo "$as_me:7537: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7866,11 +7869,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7869: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7872: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7873: \$? = $ac_status" >&5
+   echo "$as_me:7876: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7971,11 +7974,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7974: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7977: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7978: \$? = $ac_status" >&5
+   echo "$as_me:7981: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8026,11 +8029,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8029: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8032: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8033: \$? = $ac_status" >&5
+   echo "$as_me:8036: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10826,7 +10829,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10829 "configure"
+#line 10832 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10922,7 +10925,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10925 "configure"
+#line 10928 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16039,11 +16042,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16042: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16045: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16046: \$? = $ac_status" >&5
+   echo "$as_me:16049: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16138,11 +16141,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16141: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16144: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16145: \$? = $ac_status" >&5
+   echo "$as_me:16148: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16190,11 +16193,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16196: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16197: \$? = $ac_status" >&5
+   echo "$as_me:16200: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20171,6 +20174,11 @@ kpse_save_LIBS=$LIBS
 CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES"
 LIBS="$KPATHSEA_LIBS $LIBS"
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5
 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; }
 if test "${kpse_cv_have_opentype_format+set}" = set; then
@@ -20232,6 +20240,13 @@ else
   build=no
 { $as_echo "$as_me:$LINENO: WARNING: Kpathsea does not support opentype files, can not build xdv2pdf." >&5
 $as_echo "$as_me: WARNING: Kpathsea does not support opentype files, can not build xdv2pdf." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 fi
 
 CPPFLAGS=$kpse_save_CPPFLAGS
diff --git a/Build/source/texk/xdv2pdf/configure.ac b/Build/source/texk/xdv2pdf/configure.ac
index efe6e62ccc5..7eebb7787fb 100644
--- a/Build/source/texk/xdv2pdf/configure.ac
+++ b/Build/source/texk/xdv2pdf/configure.ac
@@ -50,7 +50,7 @@ dnl Check that Kpathsea supports the opentype file format.
 KPSE_ADD_FLAGS([kpathsea])
 KPSE_CHECK_KPSE_FORMAT([opentype], ,
                        [build=no
-AC_MSG_WARN([Kpathsea does not support opentype files, can not build xdv2pdf.])])
+KPSE_MSG_WARN([Kpathsea does not support opentype files, can not build xdv2pdf.])])
 KPSE_RESTORE_FLAGS
 
 fi
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 439eaf9a1d0..2a1e0c0b73b 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -940,6 +940,7 @@ enable_largefile
 enable_compiler_warnings
 with_xdvi_x_toolkit
 with_ps
+enable_missing
 enable_a4
 with_x
 with_iconv_include
@@ -1617,6 +1618,8 @@ Optional Features:
   --enable-compiler-warnings=[no|min|yes|max]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
   --disable-a4            Set default paper size to letter and default unit to
                           inch
   --enable-magick         Use ImageMagick to load/render image files.
@@ -4402,13 +4405,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4405: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4408: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4411: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4411: output\"" >&5)
+  (eval echo "\"\$as_me:4414: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5614,7 +5617,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5617 "configure"' > conftest.$ac_ext
+  echo '#line 5620 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7575,11 +7578,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7581: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7582: \$? = $ac_status" >&5
+   echo "$as_me:7585: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7914,11 +7917,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7920: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7921: \$? = $ac_status" >&5
+   echo "$as_me:7924: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8019,11 +8022,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8025: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8026: \$? = $ac_status" >&5
+   echo "$as_me:8029: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8074,11 +8077,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8080: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8081: \$? = $ac_status" >&5
+   echo "$as_me:8084: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10874,7 +10877,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10877 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10970,7 +10973,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10973 "configure"
+#line 10976 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13115,6 +13118,11 @@ if test "${with_ps+set}" = set; then
   withval=$with_ps;
 fi
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 case $with_ps in
   "" | yes | gs) PS_DEF=-DPS_GS ;;
   no) PS_DEF= ;;
@@ -13122,6 +13130,13 @@ case $with_ps in
   news) PS_DEF=-DPS_NEWS ;;
   *) { $as_echo "$as_me:$LINENO: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&5
 $as_echo "$as_me: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                           PS_DEF=-DPS_GS ;;
 esac
 
@@ -20758,9 +20773,16 @@ case $with_xdvi_x_toolkit in
   y | ye | yes) val=yes ;;
   m | mo | mot | moti | motif) val=motif ;;
   *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument
-                                                     \`$with_xdvi_x_toolkit'; using xaw." >&5
+                                                       \`$with_xdvi_x_toolkit'; using xaw." >&5
 $as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument
-                                                     \`$with_xdvi_x_toolkit'; using xaw." >&2;}
+                                                       \`$with_xdvi_x_toolkit'; using xaw." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                                         val=xaw ;;
 esac
 
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index a00f2320ef3..5fea1bfcf8c 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -29,7 +29,7 @@ AS_CASE([$with_ps],
         [no],            [PS_DEF=],
         [dps],           [PS_DEF=-DPS_DPS],
         [news],          [PS_DEF=-DPS_NEWS],
-                         [AC_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
+                         [KPSE_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
                           PS_DEF=-DPS_GS])
 AC_SUBST([PS_DEF])
 
@@ -200,8 +200,8 @@ AS_CASE([$with_xdvi_x_toolkit],
         ["" | x | xa | xaw],           [val=xaw],
         [y | ye | yes],                [val=yes],
         [m | mo | mot | moti | motif], [val=motif],
-                                       [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument 
-                                                     `$with_xdvi_x_toolkit'; using xaw.])
+                                       [KPSE_MSG_WARN([unknown --with-xdvi-x-toolkit argument 
+                                                       `$with_xdvi_x_toolkit'; using xaw.])
                                         val=xaw])
 with_xdvi_x_toolkit=$val
 
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 2b396bd3053..3b875e1affb 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -950,6 +950,7 @@ with_system_freetype2
 with_paper
 with_fontconfig_includes
 with_fontconfig_libdir
+enable_missing
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1603,6 +1604,8 @@ Optional Features:
   --enable-compiler-warnings=[no|min|yes|max]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4375,13 +4378,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4378: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4381: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4381: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4384: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4384: output\"" >&5)
+  (eval echo "\"\$as_me:4387: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5587,7 +5590,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5590 "configure"' > conftest.$ac_ext
+  echo '#line 5593 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7548,11 +7551,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7551: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7554: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7555: \$? = $ac_status" >&5
+   echo "$as_me:7558: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7887,11 +7890,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7893: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7894: \$? = $ac_status" >&5
+   echo "$as_me:7897: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7992,11 +7995,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7995: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7998: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7999: \$? = $ac_status" >&5
+   echo "$as_me:8002: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8047,11 +8050,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8050: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8053: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8054: \$? = $ac_status" >&5
+   echo "$as_me:8057: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10847,7 +10850,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10850 "configure"
+#line 10853 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10943,7 +10946,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10946 "configure"
+#line 10949 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19077,7 +19080,12 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
-  { $as_echo "$as_me:$LINENO: WARNING: fontconfig library or ApplicationServices framework not found.
+  # Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
+{ $as_echo "$as_me:$LINENO: WARNING: fontconfig library or ApplicationServices framework not found.
 This version of xdvipdfmx requires either ApplicationServices (on Mac OS X)
 or the fontconfig library (on other platforms) to be available, otherwise it
 cannot support XeTeX output using standard system-installed fonts." >&5
@@ -19085,6 +19093,13 @@ $as_echo "$as_me: WARNING: fontconfig library or ApplicationServices framework n
 This version of xdvipdfmx requires either ApplicationServices (on Mac OS X)
 or the fontconfig library (on other platforms) to be available, otherwise it
 cannot support XeTeX output using standard system-installed fonts." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 fi
  if test "x$build" = xyes; then
   build_TRUE=
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index 280c10f4089..50d5fdc96a3 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -82,7 +82,7 @@ fi
 if test "x$build" = xyes; then
   AC_DEFINE([XETEX], 1, [Define if part of a teTeX/TeX Live build.])
 else
-  AC_MSG_WARN([fontconfig library or ApplicationServices framework not found.
+  KPSE_MSG_WARN([fontconfig library or ApplicationServices framework not found.
 This version of xdvipdfmx requires either ApplicationServices (on Mac OS X)
 or the fontconfig library (on other platforms) to be available, otherwise it
 cannot support XeTeX output using standard system-installed fonts.])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index bb9f6185a68..5c24717b2ec 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -681,6 +681,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_missing
 enable_all_pkgs
 enable_native_texlive_build
 enable_multiplatform
@@ -1443,6 +1444,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
   --disable-all-pkgs      do not build packages unless explicitly enabled
   --disable-native-texlive-build
                           do not build for the TeX Live binary distribution
@@ -1537,7 +1540,8 @@ Optional Features:
                             do not run mktextfm if TFM file missing
   --disable-mkocp-default   do not run mkocp if OCP file missing
   --disable-mkofm-default   do not run mkofm if OFM file missing
-  --enable-mktexfmt-default run mktexfmt if format file missing
+  --disable-mktexfmt-default
+                            do not run mktexfmt if format file missing
   --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
@@ -2076,6 +2080,11 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -3224,8 +3233,9 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
-## configure options for mktextmf-default & Co
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## subdirectory texk/kpathsea.
+## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
   enableval=$enable_mktexmf_default;
@@ -3272,7 +3282,7 @@ if test "${enable_mktexfmt_default+set}" = set; then
 fi
 case $enable_mktexfmt_default in
   yes|no) : ;;
-  *) enable_mktexfmt_default=no ;;
+  *) enable_mktexfmt_default=yes ;;
 esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then