reautoconf after the no-descent-into-disabled-subdirs change

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

9 files changed, 179 insertions, 923 deletions

diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 9572f1e512d..4d9bc8ace97 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -493,11 +493,18 @@ DIST_SUBDIRS = auxdir/auxsub doc $(CONF_SUBDIRS) libs utils texk
 recurse_this = 
 recurse_top = 
 
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id$
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
 # we append '--disable-build' so they can skip tests that would
 # fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
 # Code inspired by automake's way to handle recursive targets.
+#
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
diff --git a/Build/source/configure b/Build/source/configure
index 16957a20cd4..fe6336c7714 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -637,14 +637,14 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+subdirs
 cross_FALSE
 cross_TRUE
 ICU_CONFIG
 FT2_CONFIG
 PKG_CONFIG
-CONF_SUBDIRS
 MAKE_SUBDIRS
-subdirs
+CONF_SUBDIRS
 CXXCPP
 WARNING_CXXFLAGS
 am__fastdepCXX_FALSE
@@ -963,9 +963,7 @@ CXX
 CXXFLAGS
 CCC
 CXXCPP'
-ac_subdirs_all='texk/ptexenc
-texk/kpathsea
-auxdir/auxsub libs utils texk'
+ac_subdirs_all='auxdir/auxsub libs utils texk'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -5211,7 +5209,6 @@ test "x$enable_dvipsk" = xno || {
   need_kpathsea=yes
 }
 
-# $Id: withenable.ac 43246 2017-02-16 18:45:03Z karl $
 # texk/dvisvgm/ac/withenable.ac: configure.ac fragment
 ## configure options and TL libraries required for dvisvgm
 # Check whether --enable-dvisvgm was given.
@@ -21079,27 +21076,17 @@ $as_echo "$as_me:     which requires to locate the <kpathsea/paths.h> header fil
   fi
 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; }
-MAKE_SUBDIRS=
 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"
+MAKE_SUBDIRS=
+if test -x $srcdir/texk/ptexenc/configure && test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes; then
   CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs texk/ptexenc"
-
-  fi
+  MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
 fi
-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"
+if test -x $srcdir/texk/kpathsea/configure && test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes; then
   CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs texk/kpathsea"
-
-  fi
+  MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -22155,6 +22142,8 @@ else
 fi
 
 
+
+
 subdirs="$subdirs auxdir/auxsub libs utils texk"
 
 
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 0892249d220..b990f9d43e6 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -402,7 +402,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
@@ -419,11 +418,18 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 recurse_this = libs/
 recurse_top = ../
 
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
 # we append '--disable-build' so they can skip tests that would
 # fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
 # Code inspired by automake's way to handle recursive targets.
+#
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 8a079dac598..157b12b171a 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -585,14 +585,12 @@ PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
 ac_unique_file="../build-aux/missing"
-enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-CONF_SUBDIRS
 MAKE_SUBDIRS
-subdirs
+CONF_SUBDIRS
 WARNING_CFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
@@ -856,25 +854,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS'
-ac_subdirs_all='harfbuzz
-icu
-teckit
-graphite2
-zziplib
-xpdf
-poppler
-mpfr
-gmp
-cairo
-pixman
-potrace
-gd
-freetype2
-libpng
-libpaper
-luajit
-lua52
-zlib'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -4409,7 +4389,6 @@ test "x$enable_dvipsk" = xno || {
   need_kpathsea=yes
 }
 
-# $Id: withenable.ac 43246 2017-02-16 18:45:03Z karl $
 # texk/dvisvgm/ac/withenable.ac: configure.ac fragment
 ## configure options and TL libraries required for dvisvgm
 # Check whether --enable-dvisvgm was given.
@@ -6415,163 +6394,85 @@ 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; }
-MAKE_SUBDIRS=
 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"
+MAKE_SUBDIRS=
+if test -x $srcdir/harfbuzz/configure && test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes; then
   CONF_SUBDIRS="harfbuzz $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs harfbuzz"
-
-  fi
+  MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/icu/configure; then
-  test "x$with_system_icu" != xyes && test "x$need_icu" = xyes && MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
+if test -x $srcdir/icu/configure && test "x$with_system_icu" != xyes && test "x$need_icu" = xyes; then
   CONF_SUBDIRS="icu $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs icu"
-
-  fi
+  MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/teckit/configure; then
-  test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes && MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
+if test -x $srcdir/teckit/configure && test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes; then
   CONF_SUBDIRS="teckit $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs teckit"
-
-  fi
+  MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/graphite2/configure; then
-  test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes && MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
+if test -x $srcdir/graphite2/configure && test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes; then
   CONF_SUBDIRS="graphite2 $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs graphite2"
-
-  fi
+  MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/zziplib/configure; then
-  test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes && MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
+if test -x $srcdir/zziplib/configure && test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes; then
   CONF_SUBDIRS="zziplib $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs zziplib"
-
-  fi
+  MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/xpdf/configure; then
-  test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes && MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
+if test -x $srcdir/xpdf/configure && test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes; then
   CONF_SUBDIRS="xpdf $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs xpdf"
-
-  fi
+  MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/poppler/configure; then
-  test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes && MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
+if test -x $srcdir/poppler/configure && test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes; then
   CONF_SUBDIRS="poppler $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs poppler"
-
-  fi
+  MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/mpfr/configure; then
-  test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes && MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
+if test -x $srcdir/mpfr/configure && test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes; then
   CONF_SUBDIRS="mpfr $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs mpfr"
-
-  fi
+  MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/gmp/configure; then
-  test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes && MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
+if test -x $srcdir/gmp/configure && test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes; then
   CONF_SUBDIRS="gmp $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs gmp"
-
-  fi
+  MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/cairo/configure; then
-  test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes && MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
+if test -x $srcdir/cairo/configure && test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes; then
   CONF_SUBDIRS="cairo $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs cairo"
-
-  fi
+  MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/pixman/configure; then
-  test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes && MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
+if test -x $srcdir/pixman/configure && test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes; then
   CONF_SUBDIRS="pixman $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs pixman"
-
-  fi
+  MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/potrace/configure; then
-  test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes && MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
+if test -x $srcdir/potrace/configure && test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes; then
   CONF_SUBDIRS="potrace $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs potrace"
-
-  fi
+  MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/gd/configure; then
-  test "x$with_system_gd" != xyes && test "x$need_gd" = xyes && MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
+if test -x $srcdir/gd/configure && test "x$with_system_gd" != xyes && test "x$need_gd" = xyes; then
   CONF_SUBDIRS="gd $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs gd"
-
-  fi
+  MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/freetype2/configure; then
-  test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes && MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
+if test -x $srcdir/freetype2/configure && test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes; then
   CONF_SUBDIRS="freetype2 $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs freetype2"
-
-  fi
+  MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/libpng/configure; then
-  test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes && MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
+if test -x $srcdir/libpng/configure && test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes; then
   CONF_SUBDIRS="libpng $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs libpng"
-
-  fi
+  MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/libpaper/configure; then
-  test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes && MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
+if test -x $srcdir/libpaper/configure && test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes; then
   CONF_SUBDIRS="libpaper $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs libpaper"
-
-  fi
+  MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/luajit/configure; then
-  test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes && MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
+if test -x $srcdir/luajit/configure && test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes; then
   CONF_SUBDIRS="luajit $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs luajit"
-
-  fi
+  MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/lua52/configure; then
-  test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes && MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
+if test -x $srcdir/lua52/configure && test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes; then
   CONF_SUBDIRS="lua52 $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs lua52"
-
-  fi
+  MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
 fi
-if test -x $srcdir/zlib/configure; then
-  test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes && MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
+if test -x $srcdir/zlib/configure && test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes; then
   CONF_SUBDIRS="zlib $CONF_SUBDIRS"
-  if false; then
-    subdirs="$subdirs zlib"
-
-  fi
+  MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -7882,151 +7783,6 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    --disable-option-checking)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
-    as_dir="$ac_dir"; as_fn_mkdir_p
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 6d39ef87d8c..5efcfc69254 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -402,7 +402,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
@@ -419,11 +418,18 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 recurse_this = texk/
 recurse_top = ../
 
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
 # we append '--disable-build' so they can skip tests that would
 # fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
 # Code inspired by automake's way to handle recursive targets.
+#
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index b46555ae3a2..cabf9c4693a 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -585,14 +585,12 @@ PACKAGE_BUGREPORT='tex-live@tug.org'
 PACKAGE_URL=''
 
 ac_unique_file="../build-aux/missing"
-enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-CONF_SUBDIRS
 MAKE_SUBDIRS
-subdirs
+CONF_SUBDIRS
 WARNING_CFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
@@ -856,37 +854,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS'
-ac_subdirs_all='web2c
-afm2pl
-bibtex-x
-chktex
-cjkutils
-detex
-dtl
-dvi2tty
-dvidvi
-dviljk
-dvipdfm-x
-dvipng
-dvipos
-dvipsk
-dvisvgm
-gregorio
-gsftopk
-lcdf-typetools
-makeindexk
-makejvf
-mendexk
-musixtnt
-ps2pk
-psutils
-seetexk
-tex4htk
-ttf2pk2
-ttfdump
-upmendex
-xdvik
-texlive'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -4421,7 +4389,6 @@ test "x$enable_dvipsk" = xno || {
   need_kpathsea=yes
 }
 
-# $Id: withenable.ac 43246 2017-02-16 18:45:03Z karl $
 # texk/dvisvgm/ac/withenable.ac: configure.ac fragment
 ## configure options and TL libraries required for dvisvgm
 # Check whether --enable-dvisvgm was given.
@@ -6427,259 +6394,133 @@ 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; }
-MAKE_SUBDIRS=
 CONF_SUBDIRS=
-if test -x $srcdir/web2c/configure; then
-  test "x$enable_web2c" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
+MAKE_SUBDIRS=
+if test -x $srcdir/web2c/configure && test "x$enable_web2c" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS web2c"
-  if false; then
-    subdirs="$subdirs web2c"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
 fi
-if test -x $srcdir/afm2pl/configure; then
-  test "x$enable_afm2pl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
+if test -x $srcdir/afm2pl/configure && test "x$enable_afm2pl" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
-  if false; then
-    subdirs="$subdirs afm2pl"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
 fi
-if test -x $srcdir/bibtex-x/configure; then
-  test "x$enable_bibtex_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
+if test -x $srcdir/bibtex-x/configure && test "x$enable_bibtex_x" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS bibtex-x"
-  if false; then
-    subdirs="$subdirs bibtex-x"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
 fi
-if test -x $srcdir/chktex/configure; then
-  test "x$enable_chktex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
+if test -x $srcdir/chktex/configure && test "x$enable_chktex" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS chktex"
-  if false; then
-    subdirs="$subdirs chktex"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
 fi
-if test -x $srcdir/cjkutils/configure; then
-  test "x$enable_cjkutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
+if test -x $srcdir/cjkutils/configure && test "x$enable_cjkutils" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
-  if false; then
-    subdirs="$subdirs cjkutils"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
 fi
-if test -x $srcdir/detex/configure; then
-  test "x$enable_detex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
+if test -x $srcdir/detex/configure && test "x$enable_detex" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS detex"
-  if false; then
-    subdirs="$subdirs detex"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
 fi
-if test -x $srcdir/dtl/configure; then
-  test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
+if test -x $srcdir/dtl/configure && test "x$enable_dtl" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dtl"
-  if false; then
-    subdirs="$subdirs dtl"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
 fi
-if test -x $srcdir/dvi2tty/configure; then
-  test "x$enable_dvi2tty" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
+if test -x $srcdir/dvi2tty/configure && test "x$enable_dvi2tty" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
-  if false; then
-    subdirs="$subdirs dvi2tty"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
 fi
-if test -x $srcdir/dvidvi/configure; then
-  test "x$enable_dvidvi" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
+if test -x $srcdir/dvidvi/configure && test "x$enable_dvidvi" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
-  if false; then
-    subdirs="$subdirs dvidvi"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
 fi
-if test -x $srcdir/dviljk/configure; then
-  test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
+if test -x $srcdir/dviljk/configure && test "x$enable_dviljk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
-  if false; then
-    subdirs="$subdirs dviljk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
 fi
-if test -x $srcdir/dvipdfm-x/configure; then
-  test "x$enable_dvipdfm_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
+if test -x $srcdir/dvipdfm-x/configure && test "x$enable_dvipdfm_x" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"
-  if false; then
-    subdirs="$subdirs dvipdfm-x"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
 fi
-if test -x $srcdir/dvipng/configure; then
-  test "x$enable_dvipng" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
+if test -x $srcdir/dvipng/configure && test "x$enable_dvipng" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
-  if false; then
-    subdirs="$subdirs dvipng"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
 fi
-if test -x $srcdir/dvipos/configure; then
-  test "x$enable_dvipos" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
+if test -x $srcdir/dvipos/configure && test "x$enable_dvipos" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
-  if false; then
-    subdirs="$subdirs dvipos"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
 fi
-if test -x $srcdir/dvipsk/configure; then
-  test "x$enable_dvipsk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
+if test -x $srcdir/dvipsk/configure && test "x$enable_dvipsk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
-  if false; then
-    subdirs="$subdirs dvipsk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
 fi
-if test -x $srcdir/dvisvgm/configure; then
-  test "x$enable_dvisvgm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
+if test -x $srcdir/dvisvgm/configure && test "x$enable_dvisvgm" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
-  if false; then
-    subdirs="$subdirs dvisvgm"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
 fi
-if test -x $srcdir/gregorio/configure; then
-  test "x$enable_gregorio" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
+if test -x $srcdir/gregorio/configure && test "x$enable_gregorio" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS gregorio"
-  if false; then
-    subdirs="$subdirs gregorio"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
 fi
-if test -x $srcdir/gsftopk/configure; then
-  test "x$enable_gsftopk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
+if test -x $srcdir/gsftopk/configure && test "x$enable_gsftopk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
-  if false; then
-    subdirs="$subdirs gsftopk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
 fi
-if test -x $srcdir/lcdf-typetools/configure; then
-  test "x$enable_lcdf_typetools" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
+if test -x $srcdir/lcdf-typetools/configure && test "x$enable_lcdf_typetools" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS lcdf-typetools"
-  if false; then
-    subdirs="$subdirs lcdf-typetools"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
 fi
-if test -x $srcdir/makeindexk/configure; then
-  test "x$enable_makeindexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
+if test -x $srcdir/makeindexk/configure && test "x$enable_makeindexk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
-  if false; then
-    subdirs="$subdirs makeindexk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
 fi
-if test -x $srcdir/makejvf/configure; then
-  test "x$enable_makejvf" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
+if test -x $srcdir/makejvf/configure && test "x$enable_makejvf" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
-  if false; then
-    subdirs="$subdirs makejvf"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
 fi
-if test -x $srcdir/mendexk/configure; then
-  test "x$enable_mendexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
+if test -x $srcdir/mendexk/configure && test "x$enable_mendexk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
-  if false; then
-    subdirs="$subdirs mendexk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
 fi
-if test -x $srcdir/musixtnt/configure; then
-  test "x$enable_musixtnt" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
+if test -x $srcdir/musixtnt/configure && test "x$enable_musixtnt" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS musixtnt"
-  if false; then
-    subdirs="$subdirs musixtnt"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
 fi
-if test -x $srcdir/ps2pk/configure; then
-  test "x$enable_ps2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
+if test -x $srcdir/ps2pk/configure && test "x$enable_ps2pk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS ps2pk"
-  if false; then
-    subdirs="$subdirs ps2pk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
 fi
-if test -x $srcdir/psutils/configure; then
-  test "x$enable_psutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
+if test -x $srcdir/psutils/configure && test "x$enable_psutils" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS psutils"
-  if false; then
-    subdirs="$subdirs psutils"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
 fi
-if test -x $srcdir/seetexk/configure; then
-  test "x$enable_seetexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
+if test -x $srcdir/seetexk/configure && test "x$enable_seetexk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
-  if false; then
-    subdirs="$subdirs seetexk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
 fi
-if test -x $srcdir/tex4htk/configure; then
-  test "x$enable_tex4htk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
+if test -x $srcdir/tex4htk/configure && test "x$enable_tex4htk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
-  if false; then
-    subdirs="$subdirs tex4htk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
 fi
-if test -x $srcdir/ttf2pk2/configure; then
-  test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
+if test -x $srcdir/ttf2pk2/configure && test "x$enable_ttf2pk2" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
-  if false; then
-    subdirs="$subdirs ttf2pk2"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
 fi
-if test -x $srcdir/ttfdump/configure; then
-  test "x$enable_ttfdump" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
+if test -x $srcdir/ttfdump/configure && test "x$enable_ttfdump" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
-  if false; then
-    subdirs="$subdirs ttfdump"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
 fi
-if test -x $srcdir/upmendex/configure; then
-  test "x$enable_upmendex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
+if test -x $srcdir/upmendex/configure && test "x$enable_upmendex" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS upmendex"
-  if false; then
-    subdirs="$subdirs upmendex"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
 fi
-if test -x $srcdir/xdvik/configure; then
-  test "x$enable_xdvik" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
+if test -x $srcdir/xdvik/configure && test "x$enable_xdvik" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
-  if false; then
-    subdirs="$subdirs xdvik"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
 fi
-if test -x $srcdir/texlive/configure; then
-  test "x$enable_texlive" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
+if test -x $srcdir/texlive/configure && test "x$enable_texlive" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS texlive"
-  if false; then
-    subdirs="$subdirs texlive"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -7990,151 +7831,6 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    --disable-option-checking)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
-    as_dir="$ac_dir"; as_fn_mkdir_p
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
diff --git a/Build/source/texk/dvisvgm/ac/withenable.ac b/Build/source/texk/dvisvgm/ac/withenable.ac
index 1b6e80f06b6..d34eca5fb48 100644
--- a/Build/source/texk/dvisvgm/ac/withenable.ac
+++ b/Build/source/texk/dvisvgm/ac/withenable.ac
@@ -1,4 +1,3 @@
-# $Id$
 # texk/dvisvgm/ac/withenable.ac: configure.ac fragment
 dnl
 dnl Copyright 2017      Karl Berry <tex-live@tug.org>
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index aa8cc57c84e..9f9752d169d 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -402,7 +402,6 @@ psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
@@ -419,11 +418,18 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 recurse_this = utils/
 recurse_top = ../
 
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
 # we append '--disable-build' so they can skip tests that would
 # fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
 # Code inspired by automake's way to handle recursive targets.
+#
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 6e6ea028dda..abb16be4f4e 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -585,14 +585,12 @@ PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
 ac_unique_file="../build-aux/missing"
-enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-CONF_SUBDIRS
 MAKE_SUBDIRS
-subdirs
+CONF_SUBDIRS
 WARNING_CFLAGS
 MAINT
 MAINTAINER_MODE_FALSE
@@ -856,18 +854,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS'
-ac_subdirs_all='autosp
-devnag
-lacheck
-m-tx
-pmx
-ps2eps
-t1utils
-texdoctk
-tpic2pdftex
-vlna
-xindy
-xpdfopen'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -4402,7 +4389,6 @@ test "x$enable_dvipsk" = xno || {
   need_kpathsea=yes
 }
 
-# $Id: withenable.ac 43246 2017-02-16 18:45:03Z karl $
 # texk/dvisvgm/ac/withenable.ac: configure.ac fragment
 ## configure options and TL libraries required for dvisvgm
 # Check whether --enable-dvisvgm was given.
@@ -6408,107 +6394,57 @@ 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; }
-MAKE_SUBDIRS=
 CONF_SUBDIRS=
-if test -x $srcdir/autosp/configure; then
-  test "x$enable_autosp" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
+MAKE_SUBDIRS=
+if test -x $srcdir/autosp/configure && test "x$enable_autosp" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS autosp"
-  if false; then
-    subdirs="$subdirs autosp"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
 fi
-if test -x $srcdir/devnag/configure; then
-  test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+if test -x $srcdir/devnag/configure && test "x$enable_devnag" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS devnag"
-  if false; then
-    subdirs="$subdirs devnag"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
 fi
-if test -x $srcdir/lacheck/configure; then
-  test "x$enable_lacheck" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
+if test -x $srcdir/lacheck/configure && test "x$enable_lacheck" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
-  if false; then
-    subdirs="$subdirs lacheck"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
 fi
-if test -x $srcdir/m-tx/configure; then
-  test "x$enable_m_tx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
+if test -x $srcdir/m-tx/configure && test "x$enable_m_tx" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS m-tx"
-  if false; then
-    subdirs="$subdirs m-tx"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
 fi
-if test -x $srcdir/pmx/configure; then
-  test "x$enable_pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
+if test -x $srcdir/pmx/configure && test "x$enable_pmx" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS pmx"
-  if false; then
-    subdirs="$subdirs pmx"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
 fi
-if test -x $srcdir/ps2eps/configure; then
-  test "x$enable_ps2eps" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
+if test -x $srcdir/ps2eps/configure && test "x$enable_ps2eps" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS ps2eps"
-  if false; then
-    subdirs="$subdirs ps2eps"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
 fi
-if test -x $srcdir/t1utils/configure; then
-  test "x$enable_t1utils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
+if test -x $srcdir/t1utils/configure && test "x$enable_t1utils" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS t1utils"
-  if false; then
-    subdirs="$subdirs t1utils"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
 fi
-if test -x $srcdir/texdoctk/configure; then
-  test "x$enable_texdoctk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
+if test -x $srcdir/texdoctk/configure && test "x$enable_texdoctk" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS texdoctk"
-  if false; then
-    subdirs="$subdirs texdoctk"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
 fi
-if test -x $srcdir/tpic2pdftex/configure; then
-  test "x$enable_tpic2pdftex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
+if test -x $srcdir/tpic2pdftex/configure && test "x$enable_tpic2pdftex" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex"
-  if false; then
-    subdirs="$subdirs tpic2pdftex"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
 fi
-if test -x $srcdir/vlna/configure; then
-  test "x$enable_vlna" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
+if test -x $srcdir/vlna/configure && test "x$enable_vlna" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS vlna"
-  if false; then
-    subdirs="$subdirs vlna"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
 fi
-if test -x $srcdir/xindy/configure; then
-  test "x$enable_xindy" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
+if test -x $srcdir/xindy/configure && test "x$enable_xindy" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS xindy"
-  if false; then
-    subdirs="$subdirs xindy"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
 fi
-if test -x $srcdir/xpdfopen/configure; then
-  test "x$enable_xpdfopen" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
+if test -x $srcdir/xpdfopen/configure && test "x$enable_xpdfopen" = xyes; then
   CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen"
-  if false; then
-    subdirs="$subdirs xpdfopen"
-
-  fi
+  MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -7819,151 +7755,6 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    --disable-option-checking)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
-    as_dir="$ac_dir"; as_fn_mkdir_p
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}