-lpthread on openbsd; tldbg prefix on our own comment/trace msgs

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

6 files changed, 53 insertions, 29 deletions

diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 3879271b2ae..957005d800d 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,15 @@
+2018-12-24  Karl Berry  <karl@freefriends.org>
+
+	* kpse-common.m4,
+	* kpse-pkgs.m4,
+	* kpse-setup.m4,
+	* kpse-visibility.m4: consistently use tldbg in tracing messages,
+	both in the configure scripts and the config.log transcript.
+	* kpse-icu-flags.m4 (_KPSE_ICU_FLAGS): special case to include
+	-lpthread when $build_os is openbsd. Reported by Mojca and Nelson
+	and others, e.g.,
+	https://tug.org/pipermail/tlbuild/2017q2/003799.html
+
 2018-08-27  Karl Berry  <karl@freefriends.org>
 
 	* kpse-potrace-flags.m4: remove file, again bundled with dvisvgm.
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index c1f193d850d..f2888f43639 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -1,6 +1,7 @@
+# $Id$
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 1995-2009 Karl Berry <tex-live@tug.org>
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+# Copyright 1995-2009, 2018 Karl Berry <tex-live@tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holders
 # give unlimited permission to copy and/or distribute it,
@@ -16,7 +17,7 @@ AC_DEFUN([KPSE_LIBS_PREPARE], [])
 # Initialize infrastructure for libraries and programs in the TL tree.
 # If in the TL tree, define kpse_TL as relative path to the TL root.
 AC_DEFUN([_KPSE_INIT],
-[## $0: Initialize TL infrastructure
+[##tldbg $0: Initialize TL infrastructure.
 m4_syscmd([test -f ../../texk/kpathsea/doc/kpathsea.texi])[]dnl
 m4_if(m4_sysval, [0], [m4_define([kpse_TL], [../../])])[]dnl
 m4_ifdef([kpse_TL],
@@ -34,7 +35,7 @@ AC_DEFUN([KPSE_INIT],
 # _KPSE_USE_LIBTOOL()
 # -------------------
 AC_DEFUN([_KPSE_USE_LIBTOOL],
-[## $0: Generate a libtool script for use in configure tests
+[##tldbg $0: Generate a libtool script for use in configure tests.
 AC_PROVIDE_IFELSE([LT_INIT], ,
                   [m4_fatal([$0: requires libtool])])[]dnl
 LT_OUTPUT
@@ -79,7 +80,8 @@ AC_LANG(_AC_LANG)[]dnl
 # the TL tree).
 AC_DEFUN([_KPSE_LIB_FLAGS],
 [AC_REQUIRE([_KPSE_INIT])[]dnl
-## $0: Setup $1 (-l$2) flags
+##tldbg $0: Setup $1 (-l$2) flags.
+echo 'tldbg:[$0] called: libdir=[$1], libname=[$2], options=[$3], tlincl=[$4], tllib=[$5], tlextra=[$6], rebuildsrcdeps=[$7], rebuildblddeps=[$8].' >&AS_MESSAGE_LOG_FD
 m4_ifdef([kpse_TL],
          [_KPSE_LIB_FLAGS_TL($@)],
          [_KPSE_LIB_FLAGS_STANDALONE($@)])[]dnl
@@ -106,7 +108,8 @@ AC_DEFUN([_KPSE_TEXLIB_FLAGS],
 # --------------------------------------------------
 # Internal subroutine for use of _KPSE_LIB_FLAGS inside the TL tree.
 m4_define([_KPSE_LIB_FLAGS_TL],
-[m4_if(m4_index([ $3 ], [ lt ]), [-1], ,
+[##tldbg $0: $1 ($2) $3.
+m4_if(m4_index([ $3 ], [ lt ]), [-1], ,
        [AC_REQUIRE([_KPSE_USE_LIBTOOL])])[]dnl m4_if
 m4_if(m4_index([ $3 ], [ tree ]), [-1],
 [KPSE_]AS_TR_CPP([$1])[_OPTIONS([with-system])[]dnl
@@ -140,7 +143,8 @@ m4_if(m4_index([ $3 ], [ tree ]), [-1],
 # ----------------------------------------------------
 # Internal subroutine for standalone use of _KPSE_LIB_FLAGS.
 m4_define([_KPSE_LIB_FLAGS_STANDALONE],
-[m4_if(m4_index([ $3 ], [ tree ]), [-1],
+[##tldbg $0: $1 ($2) $3.
+m4_if(m4_index([ $3 ], [ tree ]), [-1],
 [KPSE_]AS_TR_CPP([$1])[_OPTIONS([])]dnl
 [KPSE_]AS_TR_CPP([$1])[_SYSTEM_FLAGS],
 [m4_fatal([$0: not in TL tree])])[]dnl m4_if
@@ -167,7 +171,8 @@ AC_ARG_WITH([$1-libdir],
 # ---------------------------------------
 # Internal subroutine: default flags for system library.
 m4_define([_KPSE_LIB_FLAGS_SYSTEM],
-[if test "x$with_[]AS_TR_SH($1)_includes" != x && test "x$with_[]AS_TR_SH($1)_includes" != xyes; then
+[##tldbg $0: $1 ($2).
+if test "x$with_[]AS_TR_SH($1)_includes" != x && test "x$with_[]AS_TR_SH($1)_includes" != xyes; then
   AS_TR_CPP($1)_INCLUDES="-I$with_[]AS_TR_SH($1)_includes"
 fi
 AS_TR_CPP($1)_LIBS="-l$2"
@@ -207,7 +212,8 @@ eval LIBS=\"$[]AS_TR_CPP($1)_LIBS \$LIBS\"
 # Common Autoconf code for all libraries and programs.
 #
 # Initialization of Automake, compiler warnings, etc.
-AC_DEFUN([KPSE_BASIC], [dnl Remember PACKAGE-NAME as Kpse_Package (for future messages)
+AC_DEFUN([KPSE_BASIC], [dnl
+##tldbg $0: Remember $1 ($2) as Kpse_Package (for future messages).
 m4_define([Kpse_Package], [$1])
 dnl
 AM_INIT_AUTOMAKE([foreign silent-rules subdir-objects]m4_ifval([$2], [ $2]))
@@ -234,6 +240,7 @@ KPSE_COMPILER_WARNINGS
 # Originally written by Karl Berry as texk/kpathsea/common.ac.
 #
 AC_DEFUN([KPSE_COMMON], [dnl
+##tldbg $0: $1 ($2).
 KPSE_BASIC($@)
 dnl
 LT_PREREQ([2.2.6])
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
index b17eac24e05..57d3d9c841c 100644
--- a/Build/source/m4/kpse-icu-flags.m4
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -1,22 +1,24 @@
 # $Id$
-# ICU support for the TeX Live (TL) tree.
-# Copyright 2017 Karl Berry <tex-live@tug.org>
+# ICU support in the TeX Live (TL) tree.
+# Copyright 2017-2018 Karl Berry <tex-live@tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# KPSE_ICU_FLAGS([MORE-ICU-LIBS], [ICU_CONFIG_ARGS])
+# KPSE_ICU_FLAGS([MORE-ICU-LIBS], [ICU-CONFIG-ARGS])
 # --------------------------------------------------
 # Provide the configure option '--with-system-icu' (if in the TL tree).
 #
-# ICU_CONFIG_ARGS: icu-config arguments for additional icu libraries. 
+# MORE-ICU-LIBS: icu libraries from TL tree in addition to icuuc and icudata.
+# ICU-CONFIG-ARGS: icu-config arguments for additional icu libraries. 
 #
 # Set the make variables ICU_INCLUDES and ICU_LIBS to the CPPFLAGS and
 # LIBS required for the icu libraries in libs/icu/ of the TL tree.
 AC_DEFUN([KPSE_ICU_FLAGS],
-[m4_pushdef([kpse_icu_config_args], [$2])[]dnl
+[echo 'tldbg:[$0] called: more-icu-libs=[$1], icu-config-args=[$2].' >&AS_MESSAGE_LOG_FD
+m4_pushdef([kpse_icu_config_args], [$2])[]dnl
 _KPSE_ICU_FLAGS([icuxxx], [], [$1])[]dnl
 m4_popdef([kpse_icu_config_args])[]dnl
 ]) # KPSE_ICU_FLAGS
@@ -26,8 +28,7 @@ m4_popdef([kpse_icu_config_args])[]dnl
 # Internal subroutine.
 #
 # LIBNAME and OPTIONS as for _KPSE_LIB_FLAGS().
-# MORE-ICU-LIBS: icu libraries from the TL tree in addition to icuuc and
-# icudata.
+# MORE-ICU-LIBS: as above.
 m4_define([_KPSE_ICU_FLAGS], [dnl
 _KPSE_LIB_FLAGS([icu], [$1], [$2],
                 [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include],
@@ -36,6 +37,12 @@ _KPSE_LIB_FLAGS([icu], [$1], [$2],
                              [BLD/libs/icu/icu-build/lib/libicu\1.a]),
                 [],
                 [], [${top_builddir}/../../libs/icu/include/unicode/uversion.h])[]dnl
+# checking for openbsd to add -lpthread for icu.
+case $build_os in
+openbsd*)
+  eval AS_TR_CPP($1)_LIBS=\"$[]AS_TR_CPP($1)_LIBS -lpthread\"
+  ;;
+esac
 ]) # _KPSE_ICU_FLAGS
 
 # KPSE_ICU_OPTIONS([WITH-SYSTEM])
@@ -51,7 +58,7 @@ m4_ifval([$1],
 # ---------------------
 AC_DEFUN([KPSE_ICU_SYSTEM_FLAGS], [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-echo 'dbg:[_KPSE_ICU_SYSTEM_FLAGS] called.' >&AS_MESSAGE_LOG_FD
+echo 'tldbg:[$0] called.' >&AS_MESSAGE_LOG_FD
 AC_CHECK_TOOL([ICU_CONFIG], [icu-config], [false])[]dnl
 AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
 if $ICU_CONFIG --version >/dev/null 2>&1; then
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 75ec08f5894..023c3686127 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -7,9 +7,9 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-## ------------------------------ ##
-## Define lists of sub-packages.  ##
-## ------------------------------ ##
+# ------------------------------ #
+# Define lists of sub-packages.  #
+# ------------------------------ #
 
 # Hopefully these lists are defined here and nowhere else.
 # Note: directories in these lists need not exist.
@@ -136,11 +136,9 @@ xdvik
 texlive
 ])]) # KPSE_TEXK_PKGS
 
-
-
-## ------------------------------- ##
-##  Loop over one of these lists.  ##
-## ------------------------------- ##
+# ------------------------------- #
+#  Loop over one of these lists.  #
+# ------------------------------- #
 
 # KPSE_FOR_PKGS(LIST, ACTION)
 # ---------------------------
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index e0c1f8605d4..e2d15b33b78 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -1,6 +1,6 @@
 # $Id$
 # Private macros for the TeX Live (TL) tree.
-# Copyright 2017      Karl Berry <tex-live@tug.org>
+# Copyright 2017-2018 Karl Berry <tex-live@tug.org>
 # Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
@@ -275,7 +275,7 @@ m4_popdef([Kpse_add])[]dnl
 # 
 m4_define([_KPSE_RECURSE], [dnl
 AC_MSG_CHECKING([for $2 to build])
-echo 'dbg:[_KPSE_RECURSE] called: list=$1, text=$2, cond=$3, prefix=$4.' >&AS_MESSAGE_LOG_FD
+echo 'tldbg:[$0] called: list=[$1], text=[$2], cond=[$3], prefix=[$4].' >&AS_MESSAGE_LOG_FD
 MAKE_SUBDIRS=
 CONF_SUBDIRS=
 KPSE_FOR_PKGS([$1], [dnl
diff --git a/Build/source/m4/kpse-visibility.m4 b/Build/source/m4/kpse-visibility.m4
index 452e354d08e..5bdb8b93af5 100644
--- a/Build/source/m4/kpse-visibility.m4
+++ b/Build/source/m4/kpse-visibility.m4
@@ -1,6 +1,6 @@
 # $Id$
 # Public macros for the TeX Live (TL) tree.
-# Copyright 2017 Karl Berry <tex-live@tug.org>
+# Copyright 2017-2018 Karl Berry <tex-live@tug.org>
 # Copyright 2013-2014 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
@@ -15,7 +15,7 @@
 # them a Makefile.am must use them, e.g., in AM_CFLAGS or AM_CXXFLAGS.
 AC_DEFUN([KPSE_COMPILER_VISIBILITY],
 [dnl arrange that AC_PROG_CC uses _KPSE_VISIBILITY_CFLAGS etc.
-echo 'dbg:[_KPSE_COMPILER_VISIBILITY] called.' >&AS_MESSAGE_LOG_FD
+echo 'tldbg:[$0] called.' >&AS_MESSAGE_LOG_FD
 AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_KPSE_VISIBILITY_CFLAGS],
                   [m4_define([AC_PROG_CC],