summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-icu-flags.m4
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-24 23:17:30 +0000
committerKarl Berry <karl@freefriends.org>2018-12-24 23:17:30 +0000
commite598b6a83ccb96d578300e10f1e269ef88027faf (patch)
treebae1e06142ff872bab76a290840ccd09b7833857 /Build/source/m4/kpse-icu-flags.m4
parenta13030f39366d2ba11509849863e9f6a9d78af89 (diff)
-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
Diffstat (limited to 'Build/source/m4/kpse-icu-flags.m4')
-rw-r--r--Build/source/m4/kpse-icu-flags.m423
1 files changed, 15 insertions, 8 deletions
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