r770 - in branches/stable/source: . src src/libs src/m4 src/texk src/texk/web2c src/utils

karl at freefriends.org karl at freefriends.org
Wed Mar 8 00:50:48 CET 2017


Author: karl
Date: 2017-03-07 23:50:48 +0000 (Tue, 07 Mar 2017)
New Revision: 770

Modified:
   branches/stable/source/build-pdftex.sh
   branches/stable/source/src/Makefile.in
   branches/stable/source/src/configure
   branches/stable/source/src/libs/configure
   branches/stable/source/src/m4/kpse-setup.m4
   branches/stable/source/src/texk/configure
   branches/stable/source/src/texk/web2c/ctangleboot.cin
   branches/stable/source/src/utils/configure
   branches/stable/source/sync-pdftex.sh
Log:
restore old configure behavior from tl, for now, to get build working in our cut-down tree

Modified: branches/stable/source/build-pdftex.sh
===================================================================
--- branches/stable/source/build-pdftex.sh	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/build-pdftex.sh	2017-03-07 23:50:48 UTC (rev 770)
@@ -12,12 +12,18 @@
     exit 1
 fi
 
-# just build pdftex.
+# just build pdftex; normally disable poppler here since typically we
+# want to build/debug with our own libxpdf.
+# 
+able_poppler=--disable-poppler
+#
 CFG_OPTS="\
     --without-x \
     --disable-shared \
     --disable-all-pkgs \
     --enable-pdftex \
+    --disable-synctex \
+    $able_poppler \
     --enable-native-texlive-build \
     --enable-cxx-runtime-hack \
 "
@@ -60,10 +66,10 @@
     --without-system-zlib \
     --without-system-zziplib \
 "
-CFG_OPTS="$CFG_OPTS $DEBUG_OPTS $DISABLE_SYSTEM_LIBS"
+CFG_OPTS="-C $CFG_OPTS $DEBUG_OPTS $DISABLE_SYSTEM_LIBS"
 
 export CONFIG_SHELL=/bin/bash
-build_dir=$(pwd)/build-pdftex
+build_dir=`pwd`/build-pdftex
 
 set -x
 rm -rf $build_dir && mkdir $build_dir && cd $build_dir

Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/Makefile.in	2017-03-07 23:50:48 UTC (rev 770)
@@ -493,7 +493,7 @@
 recurse_this = 
 recurse_top = 
 
-# $Id: Makefile.in 43263 2017-02-17 22:52:17Z karl $
+# $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).

Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/configure	2017-03-07 23:50:48 UTC (rev 770)
@@ -21080,14 +21080,34 @@
 $as_echo_n "checking for TeX specific libraries to build... " >&6; }
 CONF_SUBDIRS=
 MAKE_SUBDIRS=
-if test -x $srcdir/texk/ptexenc/configure && test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes; then
+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
+#
+#old if test -x $srcdir/texk/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/texk/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new 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"
   CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
-  MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
 fi
+#
+#old if test -x $srcdir/texk/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/texk/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 $as_echo "$MAKE_SUBDIRS" >&6; }

Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/libs/configure	2017-03-07 23:50:48 UTC (rev 770)
@@ -6398,82 +6398,272 @@
 $as_echo_n "checking for generic libraries to build... " >&6; }
 CONF_SUBDIRS=
 MAKE_SUBDIRS=
-if test -x $srcdir/harfbuzz/configure && test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes; then
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 $as_echo "$MAKE_SUBDIRS" >&6; }

Modified: branches/stable/source/src/m4/kpse-setup.m4
===================================================================
--- branches/stable/source/src/m4/kpse-setup.m4	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/m4/kpse-setup.m4	2017-03-07 23:50:48 UTC (rev 770)
@@ -276,10 +276,20 @@
 MAKE_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
+#
+#old if test -x $srcdir/$4Kpse_Pkg/configure; then
+#old   $3 && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/$4Kpse_Pkg/configure && $3; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
 ])[]dnl m4_ifdef
 ])
 AC_SUBST([CONF_SUBDIRS])[]dnl

Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/texk/configure	2017-03-07 23:50:48 UTC (rev 770)
@@ -6398,130 +6398,440 @@
 $as_echo_n "checking for TeXk programs to build... " >&6; }
 CONF_SUBDIRS=
 MAKE_SUBDIRS=
-if test -x $srcdir/web2c/configure && test "x$enable_web2c" = xyes; then
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 $as_echo "$MAKE_SUBDIRS" >&6; }

Modified: branches/stable/source/src/texk/web2c/ctangleboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/ctangleboot.cin	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/texk/web2c/ctangleboot.cin	2017-03-07 23:50:48 UTC (rev 770)
@@ -220,13 +220,14 @@
 extern int line[];
 extern int change_line;
 #line 150 "cwebdir/common.h"
+extern change_depth;
 extern boolean input_has_ended;
 extern boolean changing;
 extern boolean web_file_open;
-#line 156 "cwebdir/common.h"
+#line 157 "cwebdir/common.h"
 
 /*:10*//*11:*/
-#line 158 "cwebdir/common.h"
+#line 159 "cwebdir/common.h"
 
 typedef unsigned short sixteen_bits;
 extern sixteen_bits section_count;
@@ -235,7 +236,7 @@
 extern boolean print_where;
 
 /*:11*//*12:*/
-#line 170 "cwebdir/common.h"
+#line 171 "cwebdir/common.h"
 
 extern int argc;
 extern char**argv;
@@ -242,7 +243,7 @@
 extern boolean flags[];
 
 /*:12*//*13:*/
-#line 182 "cwebdir/common.h"
+#line 183 "cwebdir/common.h"
 
 extern FILE*C_file;
 extern FILE*tex_file;
@@ -251,7 +252,7 @@
 extern FILE*active_file;
 
 /*:13*//*14:*/
-#line 191 "cwebdir/common.h"
+#line 192 "cwebdir/common.h"
 
 #line 128 "cwebdir/ctangle.w"
 
@@ -358,7 +359,7 @@
 eight_bits next_control;
 
 /*:74*//*81:*/
-#line 1350 "cwebdir/ctangle.w"
+#line 1353 "cwebdir/ctangle.w"
 
 extern sixteen_bits section_count;
 
@@ -387,18 +388,18 @@
 #line 650 "cwebdir/ctangle.w"
 
 /*:47*//*89:*/
-#line 1457 "cwebdir/ctangle.w"
+#line 1460 "cwebdir/ctangle.w"
 
 #line 440 "cwebdir/ctang-w2c.ch"
 static void phase_one(void);
-#line 1459 "cwebdir/ctangle.w"
+#line 1462 "cwebdir/ctangle.w"
 
 /*:89*//*91:*/
-#line 1475 "cwebdir/ctangle.w"
+#line 1478 "cwebdir/ctangle.w"
 
 #line 458 "cwebdir/ctang-w2c.ch"
 static void skip_limbo(void);
-#line 1477 "cwebdir/ctangle.w"
+#line 1480 "cwebdir/ctangle.w"
 
 /*:91*/
 #line 70 "cwebdir/ctangle.w"
@@ -919,15 +920,18 @@
 #line 1225 "cwebdir/ctangle.w"
 
 store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
 id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
 #line 408 "cwebdir/ctang-w2c.ch"
 {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
 app_repl(a_l%0400);}
-#line 1234 "cwebdir/ctangle.w"
+#line 1237 "cwebdir/ctangle.w"
 
 /*:76*/
 #line 912 "cwebdir/ctangle.w"
@@ -1230,15 +1234,18 @@
 #line 1225 "cwebdir/ctangle.w"
 
 store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
 id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
 #line 408 "cwebdir/ctang-w2c.ch"
 {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
 app_repl(a_l%0400);}
-#line 1234 "cwebdir/ctangle.w"
+#line 1237 "cwebdir/ctangle.w"
 
 /*:76*/
 #line 1205 "cwebdir/ctangle.w"
@@ -1245,7 +1252,7 @@
 ;}
 while(1)switch(a= get_next()){
 /*77:*/
-#line 1235 "cwebdir/ctangle.w"
+#line 1238 "cwebdir/ctangle.w"
 
 case identifier:a= id_lookup(id_first,id_loc,0)-name_dir;
 app_repl((a/0400)+0200);
@@ -1253,7 +1260,7 @@
 case section_name:if(t!=section_name)goto done;
 else{
 /*78:*/
-#line 1268 "cwebdir/ctangle.w"
+#line 1271 "cwebdir/ctangle.w"
 {
 char*try_loc= loc;
 while(*try_loc==' '&&try_loc<limit)try_loc++;
@@ -1266,7 +1273,7 @@
 }
 
 /*:78*/
-#line 1241 "cwebdir/ctangle.w"
+#line 1244 "cwebdir/ctangle.w"
 ;
 a= cur_section_name-name_dir;
 app_repl((a/0400)+0250);
@@ -1275,18 +1282,21 @@
 #line 1225 "cwebdir/ctangle.w"
 
 store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
 id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
 #line 408 "cwebdir/ctang-w2c.ch"
 {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
 app_repl(a_l%0400);}
-#line 1234 "cwebdir/ctangle.w"
+#line 1237 "cwebdir/ctangle.w"
 
 /*:76*/
-#line 1245 "cwebdir/ctangle.w"
+#line 1248 "cwebdir/ctangle.w"
 ;break;
 }
 case output_defs_code:if(t!=section_name)err_print("! Misplaced @h");
@@ -1300,24 +1310,27 @@
 #line 1225 "cwebdir/ctangle.w"
 
 store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
 id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
 #line 408 "cwebdir/ctang-w2c.ch"
 {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
 app_repl(a_l%0400);}
-#line 1234 "cwebdir/ctangle.w"
+#line 1237 "cwebdir/ctangle.w"
 
 /*:76*/
-#line 1254 "cwebdir/ctangle.w"
+#line 1257 "cwebdir/ctangle.w"
 ;
 }
 break;
 case constant:case string:
 /*79:*/
-#line 1279 "cwebdir/ctangle.w"
+#line 1282 "cwebdir/ctangle.w"
 
 app_repl(a);
 while(id_first<id_loc){
@@ -1331,11 +1344,11 @@
 app_repl(a);break;
 
 /*:79*/
-#line 1258 "cwebdir/ctangle.w"
+#line 1261 "cwebdir/ctangle.w"
 ;
 case ord:
 /*80:*/
-#line 1295 "cwebdir/ctangle.w"
+#line 1298 "cwebdir/ctangle.w"
 {
 int c= (eight_bits)*id_first;
 if(c=='\\'){
@@ -1363,7 +1376,7 @@
 ++id_first;
 #line 417 "cwebdir/ctang-w2c.ch"
 c= toupper((unsigned char)*id_first)-'A'+10;
-#line 1321 "cwebdir/ctangle.w"
+#line 1324 "cwebdir/ctangle.w"
 }
 if(xisdigit(*(id_first+1)))c= 16*c+*(++id_first)-'0';
 else if(xisxdigit(*(id_first+1))){
@@ -1370,7 +1383,7 @@
 ++id_first;
 #line 422 "cwebdir/ctang-w2c.ch"
 c= 16*c+toupper((unsigned char)*id_first)-'A'+10;
-#line 1326 "cwebdir/ctangle.w"
+#line 1329 "cwebdir/ctangle.w"
 }
 break;
 case'\\':c= '\\';break;
@@ -1390,7 +1403,7 @@
 break;
 
 /*:80*/
-#line 1260 "cwebdir/ctangle.w"
+#line 1263 "cwebdir/ctangle.w"
 ;
 case definition:case format_code:case begin_C:if(t!=section_name)goto done;
 else{
@@ -1413,12 +1426,12 @@
 }
 
 /*:75*//*82:*/
-#line 1357 "cwebdir/ctangle.w"
+#line 1360 "cwebdir/ctangle.w"
 
 #line 431 "cwebdir/ctang-w2c.ch"
 static void
 scan_section(void)
-#line 1360 "cwebdir/ctangle.w"
+#line 1363 "cwebdir/ctangle.w"
 {
 name_pointer p;
 text_pointer q;
@@ -1430,7 +1443,7 @@
 next_control= 0;
 while(1){
 /*83:*/
-#line 1396 "cwebdir/ctangle.w"
+#line 1399 "cwebdir/ctangle.w"
 
 while(next_control<definition)
 
@@ -1439,11 +1452,11 @@
 }
 
 /*:83*/
-#line 1371 "cwebdir/ctangle.w"
+#line 1374 "cwebdir/ctangle.w"
 ;
 if(next_control==definition){
 /*84:*/
-#line 1403 "cwebdir/ctangle.w"
+#line 1406 "cwebdir/ctangle.w"
 {
 while((next_control= get_next())=='\n');
 if(next_control!=identifier){
@@ -1462,7 +1475,7 @@
 }
 
 /*:84*/
-#line 1373 "cwebdir/ctangle.w"
+#line 1376 "cwebdir/ctangle.w"
 
 continue;
 }
@@ -1472,7 +1485,7 @@
 if(next_control==section_name){
 p= cur_section_name;
 /*85:*/
-#line 1428 "cwebdir/ctangle.w"
+#line 1431 "cwebdir/ctangle.w"
 
 while((next_control= get_next())=='+');
 if(next_control!='='&&next_control!=eq_eq)
@@ -1479,7 +1492,7 @@
 continue;
 
 /*:85*/
-#line 1381 "cwebdir/ctangle.w"
+#line 1384 "cwebdir/ctangle.w"
 ;
 break;
 }
@@ -1487,20 +1500,20 @@
 }
 no_where= print_where= 0;
 /*86:*/
-#line 1433 "cwebdir/ctangle.w"
+#line 1436 "cwebdir/ctangle.w"
 
 /*87:*/
-#line 1438 "cwebdir/ctangle.w"
+#line 1441 "cwebdir/ctangle.w"
 
 store_two_bytes((sixteen_bits)(0150000+section_count));
 
 
 /*:87*/
-#line 1434 "cwebdir/ctangle.w"
+#line 1437 "cwebdir/ctangle.w"
 ;
 scan_repl(section_name);
 /*88:*/
-#line 1442 "cwebdir/ctangle.w"
+#line 1445 "cwebdir/ctangle.w"
 
 if(p==name_dir||p==0){
 (last_unnamed)->text_link= cur_text-text_info;last_unnamed= cur_text;
@@ -1517,21 +1530,21 @@
 
 
 /*:88*/
-#line 1436 "cwebdir/ctangle.w"
+#line 1439 "cwebdir/ctangle.w"
 ;
 
 /*:86*/
-#line 1387 "cwebdir/ctangle.w"
+#line 1390 "cwebdir/ctangle.w"
 ;
 }
 
 /*:82*//*90:*/
-#line 1460 "cwebdir/ctangle.w"
+#line 1463 "cwebdir/ctangle.w"
 
 #line 449 "cwebdir/ctang-w2c.ch"
 static void
 phase_one(void){
-#line 1463 "cwebdir/ctangle.w"
+#line 1466 "cwebdir/ctangle.w"
 phase= 1;
 section_count= 0;
 reset_input();
@@ -1542,12 +1555,12 @@
 }
 
 /*:90*//*92:*/
-#line 1478 "cwebdir/ctangle.w"
+#line 1481 "cwebdir/ctangle.w"
 
 #line 467 "cwebdir/ctang-w2c.ch"
 static void
 skip_limbo(void)
-#line 1481 "cwebdir/ctangle.w"
+#line 1484 "cwebdir/ctangle.w"
 {
 char c;
 while(1){
@@ -1559,7 +1572,7 @@
 if(ccode[(eight_bits)c]==new_section)break;
 switch(ccode[(eight_bits)c]){
 case translit_code:/*93:*/
-#line 1507 "cwebdir/ctangle.w"
+#line 1510 "cwebdir/ctangle.w"
 
 while(xisspace(*loc)&&loc<limit)loc++;
 loc+= 3;
@@ -1584,7 +1597,7 @@
 }
 
 /*:93*/
-#line 1491 "cwebdir/ctangle.w"
+#line 1494 "cwebdir/ctangle.w"
 ;break;
 case format_code:case'@':break;
 case control_text:if(c=='q'||c=='Q'){
@@ -1602,12 +1615,12 @@
 }
 
 /*:92*//*94:*/
-#line 1533 "cwebdir/ctangle.w"
+#line 1536 "cwebdir/ctangle.w"
 
 void
 #line 476 "cwebdir/ctang-w2c.ch"
  print_stats(void){
-#line 1536 "cwebdir/ctangle.w"
+#line 1539 "cwebdir/ctangle.w"
 printf("\nMemory usage statistics:\n");
 printf("%ld names (out of %ld)\n",
 (long)(name_ptr-name_dir),(long)max_names);

Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/src/utils/configure	2017-03-07 23:50:48 UTC (rev 770)
@@ -6398,54 +6398,174 @@
 $as_echo_n "checking for Utils programs to build... " >&6; }
 CONF_SUBDIRS=
 MAKE_SUBDIRS=
-if test -x $srcdir/autosp/configure && test "x$enable_autosp" = xyes; then
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
+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
+#
+#old if test -x $srcdir/Kpse_Pkg/configure; then
+#old   test "x$enable_[]Kpse_pkg" = xyes && Kpse_add([MAKE_SUBDIRS])
+#old   Kpse_add([CONF_SUBDIRS])
+#old fi
+#
+#new if test -x $srcdir/Kpse_Pkg/configure && test "x$enable_[]Kpse_pkg" = xyes; then
+#new   Kpse_add([CONF_SUBDIRS])
+#new   Kpse_add([MAKE_SUBDIRS])
+#new fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
 $as_echo "$MAKE_SUBDIRS" >&6; }

Modified: branches/stable/source/sync-pdftex.sh
===================================================================
--- branches/stable/source/sync-pdftex.sh	2017-03-07 19:07:21 UTC (rev 769)
+++ branches/stable/source/sync-pdftex.sh	2017-03-07 23:50:48 UTC (rev 770)
@@ -32,7 +32,7 @@
 cd "$mydir/src" || exit 1
 
 # use rsync instead of cp so we can get local deletion for free.
-copy="rsync -ari --delete --exclude=.svn"
+copy="rsync -ari --delete --exclude=.svn --exclude=autom4te.cache"
 if $chicken; then
   copy="$copy -n"
 fi



More information about the pdftex-commits mailing list