reautoconf

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

37 files changed, 400 insertions, 154 deletions

diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure
index 258c1d00d3d..74af46b8937 100755
--- a/Build/source/texk/afm2pl/configure
+++ b/Build/source/texk/afm2pl/configure
@@ -7835,6 +7835,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: afm2pl ().
+##tldbg KPSE_BASIC: Remember afm2pl () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13525,11 +13527,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14921,7 +14923,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure
index a2ef86597a6..8dc8cce21df 100755
--- a/Build/source/texk/bibtex-x/configure
+++ b/Build/source/texk/bibtex-x/configure
@@ -8081,6 +8081,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: bibtex-x (no-define).
+##tldbg KPSE_BASIC: Remember bibtex-x (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -17647,11 +17649,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -19308,7 +19310,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -19368,14 +19372,17 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=icuio icui18n, icu-config-args=--ldflags-icuio.' >&5
+##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib=BLD/libs/icu/icu-build/lib/libicuio.a BLD/libs/icu/icu-build/lib/libicui18n.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 
 # Check whether --with-system-icu was given.
 if test "${with_system_icu+set}" = set; then :
   withval=$with_system_icu;
 fi
 if test "x$with_system_icu" = xyes; then
-  echo 'dbg:_KPSE_ICU_SYSTEM_FLAGS called.' >&5
+  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}icu-config; ac_word=$2
@@ -19577,6 +19584,12 @@ $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
 ${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
+# checking for openbsd to add -lpthread for icu.
+case $build_os in
+openbsd*)
+  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+  ;;
+esac
 
 
  if test "x$enable_bibtex8" != xno; then
diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure
index ed68aae37b0..3dc361addec 100755
--- a/Build/source/texk/chktex/configure
+++ b/Build/source/texk/chktex/configure
@@ -7849,6 +7849,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: chktex ().
+##tldbg KPSE_BASIC: Remember chktex () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13794,11 +13796,11 @@ PERL5='/usr/bin/env perl'
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15190,7 +15192,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index ca47fbf6034..2c966ac5546 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -7845,6 +7845,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: cjkutils (no-define).
+##tldbg KPSE_BASIC: Remember cjkutils (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13533,11 +13535,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14929,7 +14931,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 8976f562206..8bf77a77b7f 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -6063,6 +6063,7 @@ else
 fi ;;
 esac
 
+##tldbg KPSE_BASIC: Remember texk () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -6419,7 +6420,7 @@ 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; }
-echo 'dbg:_KPSE_RECURSE called: list=texk, text=TeXk programs, cond=test "x$enable_Kpse_pkg" = xyes, prefix=.' >&5
+echo 'tldbg:_KPSE_RECURSE called: list=texk, text=TeXk programs, cond=test "x$enable_[]Kpse_pkg" = xyes, prefix=.' >&5
 MAKE_SUBDIRS=
 CONF_SUBDIRS=
 if test -x $srcdir/web2c/configure; then
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index 66bb28e34f4..09686c9e347 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -7839,6 +7839,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: detex ().
+##tldbg KPSE_BASIC: Remember detex () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13667,11 +13669,11 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15063,7 +15065,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index 5438e526c2e..fcd2ff667d5 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -8017,6 +8017,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dtl ().
+##tldbg KPSE_BASIC: Remember dtl () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13717,11 +13719,11 @@ ac_config_headers="$ac_config_headers config.h"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15113,7 +15115,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index 467d5252b75..f924783173c 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -7843,6 +7843,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvi2tty ().
+##tldbg KPSE_BASIC: Remember dvi2tty () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13476,11 +13478,11 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14872,7 +14874,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -14932,7 +14936,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+##tldbg _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=ptexenc, libname=ptexenc, options=lt, tlincl=-IBLD/texk/ptexenc -ISRC/texk/ptexenc, tllib=BLD/texk/ptexenc/libptexenc.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h, rebuildblddeps=.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: ptexenc (ptexenc) lt.
 
 # Check whether --with-system-ptexenc was given.
 if test "${with_system_ptexenc+set}" = set; then :
diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure
index 75ca4dd03b0..74cdac3184d 100755
--- a/Build/source/texk/dvidvi/configure
+++ b/Build/source/texk/dvidvi/configure
@@ -7837,6 +7837,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvidvi ().
+##tldbg KPSE_BASIC: Remember dvidvi () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13471,11 +13473,11 @@ ac_config_headers="$ac_config_headers config.h"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14867,7 +14869,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure
index 7c5197384e5..3aa3c85e2b8 100755
--- a/Build/source/texk/dviljk/configure
+++ b/Build/source/texk/dviljk/configure
@@ -8022,6 +8022,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dviljk (no-define).
+##tldbg KPSE_BASIC: Remember dviljk (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13725,11 +13727,11 @@ done
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15121,7 +15123,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/dviout-util/configure b/Build/source/texk/dviout-util/configure
index 4a9dca566f7..105cf581736 100755
--- a/Build/source/texk/dviout-util/configure
+++ b/Build/source/texk/dviout-util/configure
@@ -7842,6 +7842,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dviout-util ().
+##tldbg KPSE_BASIC: Remember dviout-util () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13480,11 +13482,11 @@ $as_echo "#define TL_VERSION \"TeX Live 2019/dev\"" >>confdefs.h
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14876,7 +14878,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -14936,7 +14940,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+##tldbg _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=ptexenc, libname=ptexenc, options=lt, tlincl=-IBLD/texk/ptexenc -ISRC/texk/ptexenc, tllib=BLD/texk/ptexenc/libptexenc.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h, rebuildblddeps=.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: ptexenc (ptexenc) lt.
 
 # Check whether --with-system-ptexenc was given.
 if test "${with_system_ptexenc+set}" = set; then :
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index be7b27d1670..c2175c16a47 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -8052,6 +8052,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvipdfm-x ().
+##tldbg KPSE_BASIC: Remember dvipdfm-x () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -14333,11 +14335,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15729,7 +15731,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -15789,7 +15793,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -15806,7 +15812,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
@@ -15865,7 +15872,9 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
+##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
 
 # Check whether --with-system-libpng was given.
 if test "${with_system_libpng+set}" = set; then :
@@ -15889,7 +15898,9 @@ ${top_builddir}/../../libs/libpng/include/png.h:
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags
+##tldbg _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpaper, libname=paper, options=, tlincl=-IBLD/libs/libpaper/include, tllib=BLD/libs/libpaper/libpaper.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpaper/include/paper.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: libpaper (paper) .
 
 # Check whether --with-system-libpaper was given.
 if test "${with_system_libpaper+set}" = set; then :
@@ -15906,7 +15917,8 @@ if test "${with_libpaper_libdir+set}" = set; then :
   withval=$with_libpaper_libdir;
 fi
 if test "x$with_system_libpaper" = xyes; then
-  if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: libpaper (paper).
+if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then
   LIBPAPER_INCLUDES="-I$with_libpaper_includes"
 fi
 LIBPAPER_LIBS="-lpaper"
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 0200978d6e7..d5baa649345 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -7897,6 +7897,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvipng ().
+##tldbg KPSE_BASIC: Remember dvipng () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -14676,11 +14678,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -16072,7 +16074,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -16132,7 +16136,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -16149,7 +16155,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
@@ -16208,7 +16215,9 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
+##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
 
 # Check whether --with-system-libpng was given.
 if test "${with_system_libpng+set}" = set; then :
@@ -16232,7 +16241,9 @@ ${top_builddir}/../../libs/libpng/include/png.h:
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 
 # Check whether --with-system-freetype2 was given.
 if test "${with_system_freetype2+set}" = set; then :
@@ -16393,7 +16404,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
 $as_echo "$kpse_cv_have_win32" >&6; }
 
-## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags
+##tldbg _KPSE_LIB_FLAGS: Setup gd (-lgd) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gd, libname=gd, options=, tlincl=-IBLD/libs/gd/include, tllib=BLD/libs/gd/libgd.a, tlextra=test "x$kpse_cv_have_win32" = xno || GD_INCLUDES="$GD_INCLUDES -DBGDWIN32 -DNONDLL", rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gd/include/gd.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: gd (gd) .
 
 # Check whether --with-system-gd was given.
 if test "${with_system_gd+set}" = set; then :
@@ -16410,7 +16423,8 @@ if test "${with_gd_libdir+set}" = set; then :
   withval=$with_gd_libdir;
 fi
 if test "x$with_system_gd" = xyes; then
-  if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: gd (gd).
+if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
   GD_INCLUDES="-I$with_gd_includes"
 fi
 GD_LIBS="-lgd"
diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure
index 4f14b51356d..b148776405f 100755
--- a/Build/source/texk/dvipos/configure
+++ b/Build/source/texk/dvipos/configure
@@ -7835,6 +7835,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvipos ().
+##tldbg KPSE_BASIC: Remember dvipos () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13524,11 +13526,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14920,7 +14922,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index f433aa3262f..115709edd13 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -8020,6 +8020,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvipsk ().
+##tldbg KPSE_BASIC: Remember dvipsk () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13749,11 +13751,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15145,7 +15147,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/dvipsk/squeeze/configure b/Build/source/texk/dvipsk/squeeze/configure
index 287ff9333c4..22c8c78f8de 100755
--- a/Build/source/texk/dvipsk/squeeze/configure
+++ b/Build/source/texk/dvipsk/squeeze/configure
@@ -3394,6 +3394,7 @@ else
 fi ;;
 esac
 
+##tldbg KPSE_BASIC: Remember dvipsk squeeze () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index b08fa5896e6..8bd6d85aa15 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -8184,6 +8184,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: dvisvgm ().
+##tldbg KPSE_BASIC: Remember dvisvgm () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -19794,11 +19796,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -21455,7 +21457,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -21515,7 +21519,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -21532,7 +21538,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
@@ -21591,7 +21598,9 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 
 # Check whether --with-system-freetype2 was given.
 if test "${with_system_freetype2+set}" = set; then :
@@ -21706,7 +21715,9 @@ ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -21723,7 +21734,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure
index 41c8983de8d..5148e9a8fa3 100755
--- a/Build/source/texk/gregorio/configure
+++ b/Build/source/texk/gregorio/configure
@@ -8023,6 +8023,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: gregorio ().
+##tldbg KPSE_BASIC: Remember gregorio () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -14055,11 +14057,11 @@ PERL5='/usr/bin/env perl'
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15451,7 +15453,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure
index 9e0e1d2ae10..639af528ecc 100755
--- a/Build/source/texk/gsftopk/configure
+++ b/Build/source/texk/gsftopk/configure
@@ -7835,6 +7835,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: gsftopk ().
+##tldbg KPSE_BASIC: Remember gsftopk () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13844,11 +13846,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15240,7 +15242,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 0c352c98159..6537f0559c2 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -8048,8 +8048,8 @@ fi
 
 done
 
-## KPSE_COMMON: kpathsea ().
-## KPSE_BASIC: Remember kpathsea () as Kpse_Package (for future messages)
+##tldbg KPSE_COMMON: kpathsea ().
+##tldbg KPSE_BASIC: Remember kpathsea () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 6dc791fd0a4..a5049f8968f 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -8453,6 +8453,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: lcdf-typetools ().
+##tldbg KPSE_BASIC: Remember lcdf-typetools () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -19532,11 +19534,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -21193,7 +21195,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index c191cdae309..1f65656ff10 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -7837,6 +7837,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: makeindexk (no-define).
+##tldbg KPSE_BASIC: Remember makeindexk (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13492,11 +13494,11 @@ done
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14888,7 +14890,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure
index 0e9ff22659a..d1a269deef8 100755
--- a/Build/source/texk/makejvf/configure
+++ b/Build/source/texk/makejvf/configure
@@ -7835,6 +7835,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: makejvfk (no-define).
+##tldbg KPSE_BASIC: Remember makejvfk (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13472,11 +13474,11 @@ done
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14868,7 +14870,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -14928,7 +14932,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+##tldbg _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=ptexenc, libname=ptexenc, options=lt, tlincl=-IBLD/texk/ptexenc -ISRC/texk/ptexenc, tllib=BLD/texk/ptexenc/libptexenc.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h, rebuildblddeps=.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: ptexenc (ptexenc) lt.
 
 # Check whether --with-system-ptexenc was given.
 if test "${with_system_ptexenc+set}" = set; then :
diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure
index f2d9b3faab3..2f6be10b24b 100755
--- a/Build/source/texk/mendexk/configure
+++ b/Build/source/texk/mendexk/configure
@@ -7835,6 +7835,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: mendexk (no-define).
+##tldbg KPSE_BASIC: Remember mendexk (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13499,11 +13501,11 @@ esac
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14895,7 +14897,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -14955,7 +14959,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+##tldbg _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=ptexenc, libname=ptexenc, options=lt, tlincl=-IBLD/texk/ptexenc -ISRC/texk/ptexenc, tllib=BLD/texk/ptexenc/libptexenc.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h, rebuildblddeps=.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: ptexenc (ptexenc) lt.
 
 # Check whether --with-system-ptexenc was given.
 if test "${with_system_ptexenc+set}" = set; then :
diff --git a/Build/source/texk/musixtnt/configure b/Build/source/texk/musixtnt/configure
index 02d76a14068..fc83523e0cd 100755
--- a/Build/source/texk/musixtnt/configure
+++ b/Build/source/texk/musixtnt/configure
@@ -7836,6 +7836,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: musixtnt ().
+##tldbg KPSE_BASIC: Remember musixtnt () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13563,11 +13565,11 @@ ac_config_headers="$ac_config_headers config.h"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14959,7 +14961,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/ps2pk/configure b/Build/source/texk/ps2pk/configure
index 6ee4fe78d67..475349d659d 100755
--- a/Build/source/texk/ps2pk/configure
+++ b/Build/source/texk/ps2pk/configure
@@ -7836,6 +7836,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: ps2pkm (no-define).
+##tldbg KPSE_BASIC: Remember ps2pkm (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13779,11 +13781,11 @@ test -n "$KPSEWHICH" || KPSEWHICH="false"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15175,7 +15177,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure
index 012be71770c..a973f65845c 100755
--- a/Build/source/texk/psutils/configure
+++ b/Build/source/texk/psutils/configure
@@ -7853,6 +7853,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: psutils ().
+##tldbg KPSE_BASIC: Remember psutils () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13489,11 +13491,11 @@ ac_config_headers="$ac_config_headers config.h"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14885,7 +14887,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -14945,7 +14949,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags
+##tldbg _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpaper, libname=paper, options=, tlincl=-IBLD/libs/libpaper/include, tllib=BLD/libs/libpaper/libpaper.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpaper/include/paper.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: libpaper (paper) .
 
 # Check whether --with-system-libpaper was given.
 if test "${with_system_libpaper+set}" = set; then :
@@ -14962,7 +14968,8 @@ if test "${with_libpaper_libdir+set}" = set; then :
   withval=$with_libpaper_libdir;
 fi
 if test "x$with_system_libpaper" = xyes; then
-  if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: libpaper (paper).
+if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then
   LIBPAPER_INCLUDES="-I$with_libpaper_includes"
 fi
 LIBPAPER_LIBS="-lpaper"
diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure
index 777ed203e75..08a4832bb82 100755
--- a/Build/source/texk/ptexenc/configure
+++ b/Build/source/texk/ptexenc/configure
@@ -7844,6 +7844,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: ptexenc ().
+##tldbg KPSE_BASIC: Remember ptexenc () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13474,11 +13476,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14870,7 +14872,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure
index 35e0893a120..f87119f346a 100755
--- a/Build/source/texk/seetexk/configure
+++ b/Build/source/texk/seetexk/configure
@@ -7835,6 +7835,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: seetexk ().
+##tldbg KPSE_BASIC: Remember seetexk () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13529,11 +13531,11 @@ _ACEOF
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14925,7 +14927,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure
index c13e920ed80..a971b290db8 100755
--- a/Build/source/texk/tex4htk/configure
+++ b/Build/source/texk/tex4htk/configure
@@ -8023,6 +8023,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: tex4htk ().
+##tldbg KPSE_BASIC: Remember tex4htk () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13690,11 +13692,11 @@ _ACEOF
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15086,7 +15088,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure
index e5958737c5d..8993c5d3ad2 100755
--- a/Build/source/texk/ttf2pk2/configure
+++ b/Build/source/texk/ttf2pk2/configure
@@ -7854,6 +7854,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: ttf2pk (no-define).
+##tldbg KPSE_BASIC: Remember ttf2pk (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13535,11 +13537,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -14931,7 +14933,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -14991,7 +14995,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -15008,7 +15014,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
@@ -15067,7 +15074,9 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 
 # Check whether --with-system-freetype2 was given.
 if test "${with_system_freetype2+set}" = set; then :
diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure
index f547c6fe798..5e4efe7104c 100755
--- a/Build/source/texk/ttfdump/configure
+++ b/Build/source/texk/ttfdump/configure
@@ -8018,6 +8018,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: ttfdump ().
+##tldbg KPSE_BASIC: Remember ttfdump () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -13685,11 +13687,11 @@ ac_config_headers="$ac_config_headers config.h"
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -15081,7 +15083,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index dc2f5273fe7..3e358f5c9df 100755
--- a/Build/source/texk/upmendex/configure
+++ b/Build/source/texk/upmendex/configure
@@ -8647,6 +8647,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+##tldbg KPSE_COMMON: upmendex (no-define).
+##tldbg KPSE_BASIC: Remember upmendex (no-define) as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -17788,11 +17790,11 @@ esac
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -19449,7 +19451,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -19509,14 +19513,17 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=icuio icui18n, icu-config-args=--ldflags-icuio.' >&5
+##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib=BLD/libs/icu/icu-build/lib/libicuio.a BLD/libs/icu/icu-build/lib/libicui18n.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 
 # Check whether --with-system-icu was given.
 if test "${with_system_icu+set}" = set; then :
   withval=$with_system_icu;
 fi
 if test "x$with_system_icu" = xyes; then
-  echo 'dbg:_KPSE_ICU_SYSTEM_FLAGS called.' >&5
+  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}icu-config; ac_word=$2
@@ -19718,6 +19725,12 @@ $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
 ${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
+# checking for openbsd to add -lpthread for icu.
+case $build_os in
+openbsd*)
+  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+  ;;
+esac
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index d0f95e3081a..a8308b3a400 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -8667,6 +8667,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: web2c programs ().
+##tldbg KPSE_BASIC: Remember web2c programs () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -23236,11 +23238,11 @@ _ACEOF
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -24816,7 +24818,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_link="./libtool --mode=link --tag=CC $ac_link"
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -24876,7 +24880,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+##tldbg _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=ptexenc, libname=ptexenc, options=lt, tlincl=-IBLD/texk/ptexenc -ISRC/texk/ptexenc, tllib=BLD/texk/ptexenc/libptexenc.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h, rebuildblddeps=.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: ptexenc (ptexenc) lt.
 
 # Check whether --with-system-ptexenc was given.
 if test "${with_system_ptexenc+set}" = set; then :
@@ -24898,7 +24904,9 @@ $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc
 	cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -24915,7 +24923,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
@@ -24974,7 +24983,9 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags
+##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree.
   LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include"
   LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la"
   LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la'
@@ -24984,7 +24995,9 @@ $(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h
 ${top_builddir}/../../libs/lua53/include/lua.h:
 	cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 
-## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags
+##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree.
   LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include"
   LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la"
   LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la'
@@ -24994,7 +25007,9 @@ $(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h
 ${top_builddir}/../../libs/lua52/include/lua.h:
 	cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 
-## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
+##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree.
   LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
   LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
   LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
@@ -25004,7 +25019,9 @@ $(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h
 ${top_builddir}/../../libs/luajit/include/luajit.h:
 	cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 
-## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags
+##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) .
 
 # Check whether --with-system-libpng was given.
 if test "${with_system_libpng+set}" = set; then :
@@ -25028,7 +25045,9 @@ ${top_builddir}/../../libs/libpng/include/png.h:
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 
 # Check whether --with-system-freetype2 was given.
 if test "${with_system_freetype2+set}" = set; then :
@@ -25143,7 +25162,9 @@ ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags
+##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) .
 
 # Check whether --with-system-pixman was given.
 if test "${with_system_pixman+set}" = set; then :
@@ -25167,7 +25188,9 @@ ${top_builddir}/../../libs/pixman/include/pixman.h:
 	cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags
+##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) .
 
 # Check whether --with-system-cairo was given.
 if test "${with_system_cairo+set}" = set; then :
@@ -25191,7 +25214,9 @@ ${top_builddir}/../../libs/cairo/cairo/cairo.h:
 	cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags
+##tldbg _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gmp, libname=gmp, options=, tlincl=-IBLD/libs/gmp/include, tllib=BLD/libs/gmp/libgmp.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gmp/include/gmp.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: gmp (gmp) .
 
 # Check whether --with-system-gmp was given.
 if test "${with_system_gmp+set}" = set; then :
@@ -25208,7 +25233,8 @@ if test "${with_gmp_libdir+set}" = set; then :
   withval=$with_gmp_libdir;
 fi
 if test "x$with_system_gmp" = xyes; then
-  if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: gmp (gmp).
+if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then
   GMP_INCLUDES="-I$with_gmp_includes"
 fi
 GMP_LIBS="-lgmp"
@@ -25226,7 +25252,9 @@ ${top_builddir}/../../libs/gmp/include/gmp.h:
 	cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags
+##tldbg _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfr, libname=mpfr, options=, tlincl=-IBLD/libs/mpfr/include, tllib=BLD/libs/mpfr/libmpfr.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfr/include/mpfr.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: mpfr (mpfr) .
 
 # Check whether --with-system-mpfr was given.
 if test "${with_system_mpfr+set}" = set; then :
@@ -25243,7 +25271,8 @@ if test "${with_mpfr_libdir+set}" = set; then :
   withval=$with_mpfr_libdir;
 fi
 if test "x$with_system_mpfr" = xyes; then
-  if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: mpfr (mpfr).
+if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then
   MPFR_INCLUDES="-I$with_mpfr_includes"
 fi
 MPFR_LIBS="-lmpfr"
@@ -25261,7 +25290,9 @@ ${top_builddir}/../../libs/mpfr/include/mpfr.h:
 	cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
+##tldbg _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=poppler, libname=poppler, options=, tlincl=-IBLD/libs/poppler/include, tllib=BLD/libs/poppler/libpoppler.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/poppler/include/Stream.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: poppler (poppler) .
 
 # Check whether --with-system-poppler was given.
 if test "${with_system_poppler+set}" = set; then :
@@ -25289,7 +25320,9 @@ ${top_builddir}/../../libs/poppler/include/Stream.h:
 fi
 test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
 
-## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
+##tldbg _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=xpdf, libname=xpdf, options=, tlincl=-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf, tllib=BLD/libs/xpdf/libxpdf.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/xpdf/xpdf/Stream.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: xpdf (xpdf) .
 
 # Check whether --with-system-xpdf was given.
 if test "${with_system_xpdf+set}" = set; then :
@@ -25317,7 +25350,9 @@ ${top_builddir}/../../libs/xpdf/xpdf/Stream.h:
 fi
 test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
 
-## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) .
 
 # Check whether --with-system-zziplib was given.
 if test "${with_system_zziplib+set}" = set; then :
@@ -25341,7 +25376,9 @@ ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
 	cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) .
 
 # Check whether --with-system-teckit was given.
 if test "${with_system_teckit+set}" = set; then :
@@ -25365,14 +25402,17 @@ ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h:
 	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
+##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) .
 
 # Check whether --with-system-icu was given.
 if test "${with_system_icu+set}" = set; then :
   withval=$with_system_icu;
 fi
 if test "x$with_system_icu" = xyes; then
-  echo 'dbg:_KPSE_ICU_SYSTEM_FLAGS called.' >&5
+  echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}icu-config; ac_word=$2
@@ -25574,8 +25614,16 @@ $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
 ${top_builddir}/../../libs/icu/include/unicode/uversion.h:
 	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
+# checking for openbsd to add -lpthread for icu.
+case $build_os in
+openbsd*)
+  eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\"
+  ;;
+esac
 
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 
 # Check whether --with-system-graphite2 was given.
 if test "${with_system_graphite2+set}" = set; then :
@@ -25599,7 +25647,9 @@ ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h:
 	cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (harfbuzz) .
 
 # Check whether --with-system-harfbuzz was given.
 if test "${with_system_harfbuzz+set}" = set; then :
@@ -25623,7 +25673,9 @@ ${top_builddir}/../../libs/harfbuzz/include/hb.h:
 	cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
+##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
 
 # Check whether --with-system-graphite2 was given.
 if test "${with_system_graphite2+set}" = set; then :
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index 94493ce53da..e977e3f50e2 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -8022,6 +8022,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: web2c convert ().
+##tldbg KPSE_BASIC: Remember web2c convert () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index bc8531f8348..28a6f104597 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -8107,6 +8107,8 @@ fi
 
 done
 
+##tldbg KPSE_COMMON: xdvik ().
+##tldbg KPSE_BASIC: Remember xdvik () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -17325,11 +17327,11 @@ fi
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
-## _KPSE_INIT: Initialize TL infrastructure
+##tldbg _KPSE_INIT: Initialize TL infrastructure.
 kpse_BLD=`(cd "./../../." && pwd)`
 kpse_SRC=`(cd "$srcdir/../../." && pwd)`
 
-## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests
+##tldbg _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests.
 : ${CONFIG_LT=./config.lt}
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
 $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -18721,7 +18723,9 @@ else
   PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags
+##tldbg _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=kpathsea, libname=kpathsea, options=lt, tlincl=-IBLD/texk -ISRC/texk, tllib=BLD/texk/kpathsea/libkpathsea.la, tlextra=, rebuildsrcdeps=${top_srcdir}/../kpathsea/*.[ch], rebuildblddeps=${top_builddir}/../kpathsea/paths.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: kpathsea (kpathsea) lt.
 
 # Check whether --with-system-kpathsea was given.
 if test "${with_system_kpathsea+set}" = set; then :
@@ -18781,7 +18785,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
   KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
 fi
 
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
+##tldbg _KPSE_LIB_FLAGS: Setup zlib (-lz) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zlib, libname=z, options=, tlincl=-IBLD/libs/zlib/include, tllib=BLD/libs/zlib/libz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zlib/include/zconf.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: zlib (z) .
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
@@ -18798,7 +18804,8 @@ if test "${with_zlib_libdir+set}" = set; then :
   withval=$with_zlib_libdir;
 fi
 if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: zlib (z).
+if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
   ZLIB_INCLUDES="-I$with_zlib_includes"
 fi
 ZLIB_LIBS="-lz"
@@ -18857,7 +18864,9 @@ $as_echo "#define z_const /**/" >>confdefs.h
  ;;
 esac
 
-## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) .
 
 # Check whether --with-system-freetype2 was given.
 if test "${with_system_freetype2+set}" = set; then :
diff --git a/Build/source/texk/xdvik/squeeze/configure b/Build/source/texk/xdvik/squeeze/configure
index bdb06df6a4d..9615b79f8c6 100755
--- a/Build/source/texk/xdvik/squeeze/configure
+++ b/Build/source/texk/xdvik/squeeze/configure
@@ -3394,6 +3394,7 @@ else
 fi ;;
 esac
 
+##tldbg KPSE_BASIC: Remember xdvik squeeze () as Kpse_Package (for future messages).
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output