revert to requiring configure to succeed in all subdirs, since we cannot avoid C++11 for TL 2018

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

6 files changed, 186 insertions, 148 deletions

diff --git a/Build/source/configure b/Build/source/configure
index df762e3a83c..abe0027297b 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -643,8 +643,8 @@ cross_TRUE
 ICU_CONFIG
 FT2_CONFIG
 PKG_CONFIG
-MAKE_SUBDIRS
 CONF_SUBDIRS
+MAKE_SUBDIRS
 CXXCPP
 WARNING_CXXFLAGS
 am__fastdepCXX_FALSE
@@ -21076,15 +21076,16 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeX specific libraries to build" >&5
 $as_echo_n "checking for TeX specific libraries to build... " >&6; }
-CONF_SUBDIRS=
+echo 'dbg:_KPSE_RECURSE called: list=texlibs, text=TeX specific libraries, cond=test "x$with_system_Kpse_pkg" != xyes && test "x$need_Kpse_pkg" = xyes, prefix=texk/.' >&5
 MAKE_SUBDIRS=
-if test -x $srcdir/texk/ptexenc/configure && test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes; then
+CONF_SUBDIRS=
+if test -x $srcdir/texk/ptexenc/configure; then
+  test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes && MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
   CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS"
-  MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/texk/kpathsea/configure && test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes; then
+if test -x $srcdir/texk/kpathsea/configure; then
+  test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes && MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
   CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
-  MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 12d95acae2c..454b3a6deee 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -589,8 +589,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-MAKE_SUBDIRS
 CONF_SUBDIRS
+MAKE_SUBDIRS
 WARNING_CFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
@@ -6394,83 +6394,84 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for generic libraries to build" >&5
 $as_echo_n "checking for generic libraries to build... " >&6; }
-CONF_SUBDIRS=
+echo 'dbg:_KPSE_RECURSE called: list=libs, text=generic libraries, cond=test "x$with_system_Kpse_pkg" != xyes && test "x$need_Kpse_pkg" = xyes, prefix=.' >&5
 MAKE_SUBDIRS=
-if test -x $srcdir/harfbuzz/configure && test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes; then
+CONF_SUBDIRS=
+if test -x $srcdir/harfbuzz/configure; then
+  test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes && MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
   CONF_SUBDIRS="harfbuzz $CONF_SUBDIRS"
-  MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/icu/configure && test "x$with_system_icu" != xyes && test "x$need_icu" = xyes; then
+if test -x $srcdir/icu/configure; then
+  test "x$with_system_icu" != xyes && test "x$need_icu" = xyes && MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
   CONF_SUBDIRS="icu $CONF_SUBDIRS"
-  MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/teckit/configure && test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes; then
+if test -x $srcdir/teckit/configure; then
+  test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes && MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
   CONF_SUBDIRS="teckit $CONF_SUBDIRS"
-  MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/graphite2/configure && test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes; then
+if test -x $srcdir/graphite2/configure; then
+  test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes && MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
   CONF_SUBDIRS="graphite2 $CONF_SUBDIRS"
-  MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/zziplib/configure && test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes; then
+if test -x $srcdir/zziplib/configure; then
+  test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes && MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
   CONF_SUBDIRS="zziplib $CONF_SUBDIRS"
-  MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/xpdf/configure && test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes; then
+if test -x $srcdir/xpdf/configure; then
+  test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes && MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
   CONF_SUBDIRS="xpdf $CONF_SUBDIRS"
-  MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/poppler/configure && test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes; then
+if test -x $srcdir/poppler/configure; then
+  test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes && MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
   CONF_SUBDIRS="poppler $CONF_SUBDIRS"
-  MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/mpfr/configure && test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes; then
+if test -x $srcdir/mpfr/configure; then
+  test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes && MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
   CONF_SUBDIRS="mpfr $CONF_SUBDIRS"
-  MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/gmp/configure && test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes; then
+if test -x $srcdir/gmp/configure; then
+  test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes && MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
   CONF_SUBDIRS="gmp $CONF_SUBDIRS"
-  MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/cairo/configure && test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes; then
+if test -x $srcdir/cairo/configure; then
+  test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes && MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
   CONF_SUBDIRS="cairo $CONF_SUBDIRS"
-  MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/pixman/configure && test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes; then
+if test -x $srcdir/pixman/configure; then
+  test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes && MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
   CONF_SUBDIRS="pixman $CONF_SUBDIRS"
-  MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/potrace/configure && test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes; then
+if test -x $srcdir/potrace/configure; then
+  test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes && MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
   CONF_SUBDIRS="potrace $CONF_SUBDIRS"
-  MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/gd/configure && test "x$with_system_gd" != xyes && test "x$need_gd" = xyes; then
+if test -x $srcdir/gd/configure; then
+  test "x$with_system_gd" != xyes && test "x$need_gd" = xyes && MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
   CONF_SUBDIRS="gd $CONF_SUBDIRS"
-  MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/freetype2/configure && test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes; then
+if test -x $srcdir/freetype2/configure; then
+  test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes && MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
   CONF_SUBDIRS="freetype2 $CONF_SUBDIRS"
-  MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/libpng/configure && test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes; then
+if test -x $srcdir/libpng/configure; then
+  test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes && MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
   CONF_SUBDIRS="libpng $CONF_SUBDIRS"
-  MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/libpaper/configure && test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes; then
+if test -x $srcdir/libpaper/configure; then
+  test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes && MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
   CONF_SUBDIRS="libpaper $CONF_SUBDIRS"
-  MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/luajit/configure && test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes; then
+if test -x $srcdir/luajit/configure; then
+  test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes && MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
   CONF_SUBDIRS="luajit $CONF_SUBDIRS"
-  MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/lua52/configure && test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes; then
+if test -x $srcdir/lua52/configure; then
+  test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes && MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
   CONF_SUBDIRS="lua52 $CONF_SUBDIRS"
-  MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/zlib/configure && test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes; then
+if test -x $srcdir/zlib/configure; then
+  test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes && MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
   CONF_SUBDIRS="zlib $CONF_SUBDIRS"
-  MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index d8e2d2d11a8..ca963326323 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,13 @@
+2017-11-02  Karl Berry  <karl@freefriends.org>
+
+	* kpse-setup.m4 (_KPSE_RECURSE): revert previous change,
+	as (1) it causes configure to fail in the cut-down pdftex source tree,
+	and (2) for 2018, more packages (icu, poppler, ...) are going to
+	require C++11, so we can't hack around it again. So not worth
+	spending more time refining.
+	Also, add debugging line writing to >&AS_MESSAGE_LOG_FD (config.log).
+	reautoconf.
+
 2017-02-17  Karl Berry  <karl@freefriends.org>
 
 	* kpse-setup.m4 (_KPSE_RECURSE): do not add a package to
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index fecf5b1d950..e0c1f8605d4 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -1,4 +1,4 @@
-# $Id$  (m4/kpse-setup.m4)
+# $Id$
 # Private macros for the TeX Live (TL) tree.
 # Copyright 2017      Karl Berry <tex-live@tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
@@ -15,8 +15,8 @@
 #     --with-system-LIB --with-LIB-includes --with-LIB-libdir
 #   configure options for programs:
 #     --disable-PROG --enable-PROG
-#   additional package-specific configure options, if any
-#   library dependencies for programs and libraries, if any
+#   additional program specific configure options (if any)
+#   library dependencies for programs and libraries
 AC_DEFUN([KPSE_SETUP], [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
 AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
@@ -266,23 +266,47 @@ m4_popdef([Kpse_add])[]dnl
 # -----------------------------------------
 # Internal subroutine.  Determine which of the libraries or programs in
 # kpse_LIST_pkgs to build: if a package's source directory contains a
-# configure script, and COND is true, then add to the output variables
-# MAKE_SUBDIRS and CONF_SUBDIRS.  Thus, if a package directory does not
-# exist at all, or if the package has been disabled, it will be ignored.
-#
+# configure script, then add to CONF_SUBDIRS.  If COND is true, also add
+# to MAKE_SUBDIRS.  PREFIX, if present, is prepended to the package name
+# for the directory.
+# 
+# Thus if a directory has a configure script, the configure must succeed,
+# even if the package has been disabled. This is suboptimal, but see below.
+# 
 m4_define([_KPSE_RECURSE], [dnl
 AC_MSG_CHECKING([for $2 to build])
-CONF_SUBDIRS=
+echo 'dbg:[_KPSE_RECURSE] called: list=$1, text=$2, cond=$3, prefix=$4.' >&AS_MESSAGE_LOG_FD
 MAKE_SUBDIRS=
+CONF_SUBDIRS=
 KPSE_FOR_PKGS([$1], [dnl
 m4_ifdef([have_]Kpse_pkg, [dnl
-if test -x $srcdir/$4Kpse_Pkg/configure && $3; then
+if test -x $srcdir/$4Kpse_Pkg/configure; then
+  $3 && Kpse_add([MAKE_SUBDIRS])
   Kpse_add([CONF_SUBDIRS])
-  Kpse_add([MAKE_SUBDIRS])
 fi
 ])[]dnl m4_ifdef
 ])
-AC_SUBST([CONF_SUBDIRS])[]dnl
 AC_SUBST([MAKE_SUBDIRS])[]dnl
+AC_SUBST([CONF_SUBDIRS])[]dnl
 AC_MSG_RESULT([$MAKE_SUBDIRS])[]dnl
-]) # _KPSE_RECURSE
+dnl
+dnl Historic (and current) method: assume all directories present will be
+dnl configured, but only make if the package is enabled.  This works in
+dnl the cut-down pdftex source tree, but means that configure always has
+dnl to succeed; not desirable in, e.g., 2017 when dvisvgm newly required
+dnl C++11. But for 2018, all kinds of other things also require C++11, so
+dnl might as well go back to it instead of debugging further.
+dnl #old if test -x $srcdir/$4Kpse_Pkg/configure; then
+dnl #old   $3 && Kpse_add([MAKE_SUBDIRS])
+dnl #old   Kpse_add([CONF_SUBDIRS])
+dnl #old fi
+dnl
+dnl new (and not used) method: don't try to configure if a package has
+dnl been disabled, even if the directory exists. This is more intuitive,
+dnl but does not work in the cut-down pdftex source tree.
+dnl #new if test -x $srcdir/$4Kpse_Pkg/configure && $3; then
+dnl #new   Kpse_add([CONF_SUBDIRS])
+dnl #new   Kpse_add([MAKE_SUBDIRS])
+dnl #new fi
+dnl 
+]) dnl _KPSE_RECURSE
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index a2d32aa01b4..c51fde52c3f 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -589,8 +589,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-MAKE_SUBDIRS
 CONF_SUBDIRS
+MAKE_SUBDIRS
 WARNING_CFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
@@ -6394,131 +6394,132 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeXk programs to build" >&5
 $as_echo_n "checking for TeXk programs to build... " >&6; }
-CONF_SUBDIRS=
+echo 'dbg:_KPSE_RECURSE called: list=texk, text=TeXk programs, cond=test "x$enable_Kpse_pkg" = xyes, prefix=.' >&5
 MAKE_SUBDIRS=
-if test -x $srcdir/web2c/configure && test "x$enable_web2c" = xyes; then
+CONF_SUBDIRS=
+if test -x $srcdir/web2c/configure; then
+  test "x$enable_web2c" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
   CONF_SUBDIRS="$CONF_SUBDIRS web2c"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
 fi
-if test -x $srcdir/afm2pl/configure && test "x$enable_afm2pl" = xyes; then
+if test -x $srcdir/afm2pl/configure; then
+  test "x$enable_afm2pl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
   CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
 fi
-if test -x $srcdir/bibtex-x/configure && test "x$enable_bibtex_x" = xyes; then
+if test -x $srcdir/bibtex-x/configure; then
+  test "x$enable_bibtex_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
   CONF_SUBDIRS="$CONF_SUBDIRS bibtex-x"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
 fi
-if test -x $srcdir/chktex/configure && test "x$enable_chktex" = xyes; then
+if test -x $srcdir/chktex/configure; then
+  test "x$enable_chktex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
   CONF_SUBDIRS="$CONF_SUBDIRS chktex"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
 fi
-if test -x $srcdir/cjkutils/configure && test "x$enable_cjkutils" = xyes; then
+if test -x $srcdir/cjkutils/configure; then
+  test "x$enable_cjkutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
   CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
 fi
-if test -x $srcdir/detex/configure && test "x$enable_detex" = xyes; then
+if test -x $srcdir/detex/configure; then
+  test "x$enable_detex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
   CONF_SUBDIRS="$CONF_SUBDIRS detex"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
 fi
-if test -x $srcdir/dtl/configure && test "x$enable_dtl" = xyes; then
+if test -x $srcdir/dtl/configure; then
+  test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
   CONF_SUBDIRS="$CONF_SUBDIRS dtl"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
 fi
-if test -x $srcdir/dvi2tty/configure && test "x$enable_dvi2tty" = xyes; then
+if test -x $srcdir/dvi2tty/configure; then
+  test "x$enable_dvi2tty" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
   CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
 fi
-if test -x $srcdir/dvidvi/configure && test "x$enable_dvidvi" = xyes; then
+if test -x $srcdir/dvidvi/configure; then
+  test "x$enable_dvidvi" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
   CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
 fi
-if test -x $srcdir/dviljk/configure && test "x$enable_dviljk" = xyes; then
+if test -x $srcdir/dviljk/configure; then
+  test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
   CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
 fi
-if test -x $srcdir/dvipdfm-x/configure && test "x$enable_dvipdfm_x" = xyes; then
+if test -x $srcdir/dvipdfm-x/configure; then
+  test "x$enable_dvipdfm_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
   CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
 fi
-if test -x $srcdir/dvipng/configure && test "x$enable_dvipng" = xyes; then
+if test -x $srcdir/dvipng/configure; then
+  test "x$enable_dvipng" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
   CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
 fi
-if test -x $srcdir/dvipos/configure && test "x$enable_dvipos" = xyes; then
+if test -x $srcdir/dvipos/configure; then
+  test "x$enable_dvipos" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
   CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
 fi
-if test -x $srcdir/dvipsk/configure && test "x$enable_dvipsk" = xyes; then
+if test -x $srcdir/dvipsk/configure; then
+  test "x$enable_dvipsk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
   CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
 fi
-if test -x $srcdir/dvisvgm/configure && test "x$enable_dvisvgm" = xyes; then
+if test -x $srcdir/dvisvgm/configure; then
+  test "x$enable_dvisvgm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
   CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
 fi
-if test -x $srcdir/gregorio/configure && test "x$enable_gregorio" = xyes; then
+if test -x $srcdir/gregorio/configure; then
+  test "x$enable_gregorio" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
   CONF_SUBDIRS="$CONF_SUBDIRS gregorio"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
 fi
-if test -x $srcdir/gsftopk/configure && test "x$enable_gsftopk" = xyes; then
+if test -x $srcdir/gsftopk/configure; then
+  test "x$enable_gsftopk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
   CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
 fi
-if test -x $srcdir/lcdf-typetools/configure && test "x$enable_lcdf_typetools" = xyes; then
+if test -x $srcdir/lcdf-typetools/configure; then
+  test "x$enable_lcdf_typetools" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
   CONF_SUBDIRS="$CONF_SUBDIRS lcdf-typetools"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
 fi
-if test -x $srcdir/makeindexk/configure && test "x$enable_makeindexk" = xyes; then
+if test -x $srcdir/makeindexk/configure; then
+  test "x$enable_makeindexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
   CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
 fi
-if test -x $srcdir/makejvf/configure && test "x$enable_makejvf" = xyes; then
+if test -x $srcdir/makejvf/configure; then
+  test "x$enable_makejvf" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
   CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
 fi
-if test -x $srcdir/mendexk/configure && test "x$enable_mendexk" = xyes; then
+if test -x $srcdir/mendexk/configure; then
+  test "x$enable_mendexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
   CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
 fi
-if test -x $srcdir/musixtnt/configure && test "x$enable_musixtnt" = xyes; then
+if test -x $srcdir/musixtnt/configure; then
+  test "x$enable_musixtnt" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
   CONF_SUBDIRS="$CONF_SUBDIRS musixtnt"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
 fi
-if test -x $srcdir/ps2pk/configure && test "x$enable_ps2pk" = xyes; then
+if test -x $srcdir/ps2pk/configure; then
+  test "x$enable_ps2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
   CONF_SUBDIRS="$CONF_SUBDIRS ps2pk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
 fi
-if test -x $srcdir/psutils/configure && test "x$enable_psutils" = xyes; then
+if test -x $srcdir/psutils/configure; then
+  test "x$enable_psutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
   CONF_SUBDIRS="$CONF_SUBDIRS psutils"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
 fi
-if test -x $srcdir/seetexk/configure && test "x$enable_seetexk" = xyes; then
+if test -x $srcdir/seetexk/configure; then
+  test "x$enable_seetexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
   CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
 fi
-if test -x $srcdir/tex4htk/configure && test "x$enable_tex4htk" = xyes; then
+if test -x $srcdir/tex4htk/configure; then
+  test "x$enable_tex4htk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
   CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
 fi
-if test -x $srcdir/ttf2pk2/configure && test "x$enable_ttf2pk2" = xyes; then
+if test -x $srcdir/ttf2pk2/configure; then
+  test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
   CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
 fi
-if test -x $srcdir/ttfdump/configure && test "x$enable_ttfdump" = xyes; then
+if test -x $srcdir/ttfdump/configure; then
+  test "x$enable_ttfdump" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
   CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
 fi
-if test -x $srcdir/upmendex/configure && test "x$enable_upmendex" = xyes; then
+if test -x $srcdir/upmendex/configure; then
+  test "x$enable_upmendex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
   CONF_SUBDIRS="$CONF_SUBDIRS upmendex"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
 fi
-if test -x $srcdir/xdvik/configure && test "x$enable_xdvik" = xyes; then
+if test -x $srcdir/xdvik/configure; then
+  test "x$enable_xdvik" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
   CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
 fi
-if test -x $srcdir/texlive/configure && test "x$enable_texlive" = xyes; then
+if test -x $srcdir/texlive/configure; then
+  test "x$enable_texlive" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
   CONF_SUBDIRS="$CONF_SUBDIRS texlive"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 0565990db99..73116318d33 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -589,8 +589,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-MAKE_SUBDIRS
 CONF_SUBDIRS
+MAKE_SUBDIRS
 WARNING_CFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
@@ -6394,55 +6394,56 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Utils programs to build" >&5
 $as_echo_n "checking for Utils programs to build... " >&6; }
-CONF_SUBDIRS=
+echo 'dbg:_KPSE_RECURSE called: list=utils, text=Utils programs, cond=test "x$enable_Kpse_pkg" = xyes, prefix=.' >&5
 MAKE_SUBDIRS=
-if test -x $srcdir/autosp/configure && test "x$enable_autosp" = xyes; then
+CONF_SUBDIRS=
+if test -x $srcdir/autosp/configure; then
+  test "x$enable_autosp" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
   CONF_SUBDIRS="$CONF_SUBDIRS autosp"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
 fi
-if test -x $srcdir/devnag/configure && test "x$enable_devnag" = xyes; then
+if test -x $srcdir/devnag/configure; then
+  test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
   CONF_SUBDIRS="$CONF_SUBDIRS devnag"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
 fi
-if test -x $srcdir/lacheck/configure && test "x$enable_lacheck" = xyes; then
+if test -x $srcdir/lacheck/configure; then
+  test "x$enable_lacheck" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
   CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
 fi
-if test -x $srcdir/m-tx/configure && test "x$enable_m_tx" = xyes; then
+if test -x $srcdir/m-tx/configure; then
+  test "x$enable_m_tx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
   CONF_SUBDIRS="$CONF_SUBDIRS m-tx"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
 fi
-if test -x $srcdir/pmx/configure && test "x$enable_pmx" = xyes; then
+if test -x $srcdir/pmx/configure; then
+  test "x$enable_pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
   CONF_SUBDIRS="$CONF_SUBDIRS pmx"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
 fi
-if test -x $srcdir/ps2eps/configure && test "x$enable_ps2eps" = xyes; then
+if test -x $srcdir/ps2eps/configure; then
+  test "x$enable_ps2eps" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
   CONF_SUBDIRS="$CONF_SUBDIRS ps2eps"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
 fi
-if test -x $srcdir/t1utils/configure && test "x$enable_t1utils" = xyes; then
+if test -x $srcdir/t1utils/configure; then
+  test "x$enable_t1utils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
   CONF_SUBDIRS="$CONF_SUBDIRS t1utils"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
 fi
-if test -x $srcdir/texdoctk/configure && test "x$enable_texdoctk" = xyes; then
+if test -x $srcdir/texdoctk/configure; then
+  test "x$enable_texdoctk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
   CONF_SUBDIRS="$CONF_SUBDIRS texdoctk"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
 fi
-if test -x $srcdir/tpic2pdftex/configure && test "x$enable_tpic2pdftex" = xyes; then
+if test -x $srcdir/tpic2pdftex/configure; then
+  test "x$enable_tpic2pdftex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
   CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
 fi
-if test -x $srcdir/vlna/configure && test "x$enable_vlna" = xyes; then
+if test -x $srcdir/vlna/configure; then
+  test "x$enable_vlna" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
   CONF_SUBDIRS="$CONF_SUBDIRS vlna"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
 fi
-if test -x $srcdir/xindy/configure && test "x$enable_xindy" = xyes; then
+if test -x $srcdir/xindy/configure; then
+  test "x$enable_xindy" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
   CONF_SUBDIRS="$CONF_SUBDIRS xindy"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
 fi
-if test -x $srcdir/xpdfopen/configure && test "x$enable_xpdfopen" = xyes; then
+if test -x $srcdir/xpdfopen/configure; then
+  test "x$enable_xpdfopen" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
   CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen"
-  MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5