texlive[46014] Build/source: try pkg-config as well as icu-config;
commits+karl at tug.org
commits+karl at tug.org
Fri Dec 8 00:42:13 CET 2017
Revision: 46014
http://tug.org/svn/texlive?view=revision&revision=46014
Author: karl
Date: 2017-12-08 00:42:12 +0100 (Fri, 08 Dec 2017)
Log Message:
-----------
try pkg-config as well as icu-config; reautoconf
Modified Paths:
--------------
trunk/Build/source/configure
trunk/Build/source/libs/configure
trunk/Build/source/libs/harfbuzz/configure
trunk/Build/source/m4/ChangeLog
trunk/Build/source/m4/kpse-icu-flags.m4
trunk/Build/source/texk/bibtex-x/configure
trunk/Build/source/texk/configure
trunk/Build/source/texk/upmendex/configure
trunk/Build/source/texk/web2c/configure
trunk/Build/source/utils/configure
Property Changed:
----------------
trunk/Build/source/m4/kpse-icu-flags.m4
Modified: trunk/Build/source/configure
===================================================================
--- trunk/Build/source/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1749,7 +1749,7 @@
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
--with-system-teckit use installed teckit headers and library (requires
pkg-config)
--with-system-graphite2 use installed graphite2 headers and library
@@ -21410,6 +21410,7 @@
as_fn_error $? "did not find teckit" "$LINENO" 5
fi
+echo 'dbg:_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
@@ -21501,11 +21502,105 @@
else
ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+ ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
- as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+ as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi
if $PKG_CONFIG harfbuzz-icu; then
Modified: trunk/Build/source/libs/configure
===================================================================
--- trunk/Build/source/libs/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/libs/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1630,7 +1630,7 @@
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
--with-system-teckit use installed teckit headers and library (requires
pkg-config)
--with-system-graphite2 use installed graphite2 headers and library
Modified: trunk/Build/source/libs/harfbuzz/configure
===================================================================
--- trunk/Build/source/libs/harfbuzz/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/libs/harfbuzz/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1412,7 +1412,7 @@
--with-system-graphite2 use installed graphite2 headers and library
(requires pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
Some influential environment variables:
CC C compiler command
@@ -5661,7 +5661,8 @@
withval=$with_system_icu;
fi
if test "x$with_system_icu" = xyes; then
- if test -n "$ac_tool_prefix"; then
+ echo 'dbg:_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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -5752,11 +5753,105 @@
else
ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+ ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
- as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+ as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi
else
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
Modified: trunk/Build/source/m4/ChangeLog
===================================================================
--- trunk/Build/source/m4/ChangeLog 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/m4/ChangeLog 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1,3 +1,8 @@
+2017-12-08 Norbert Preining <preining at logic.at>
+
+ * kpse-icu-flags.m4 (KPSE_ICU_SYSTEM_FLAGS): also check for PKG_CONFIG.
+ (KPSE_ICU_SYSTEM_FLAGS): try pkg-config if icu-config fails.
+
2017-12-02 Karl Berry <karl at freefriends.org>
* kpse-visibility.m4 (KPSE_COMPILER_VISIBILITY): write debug line.
Modified: trunk/Build/source/m4/kpse-icu-flags.m4
===================================================================
--- trunk/Build/source/m4/kpse-icu-flags.m4 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/m4/kpse-icu-flags.m4 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1,5 +1,7 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+# $Id$
+# ICU support for the TeX Live (TL) tree.
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -24,7 +26,8 @@
# 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: icu libraries from the TL tree in addition to icuuc and
+# icudata.
m4_define([_KPSE_ICU_FLAGS], [dnl
_KPSE_LIB_FLAGS([icu], [$1], [$2],
[-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include],
@@ -41,7 +44,7 @@
m4_ifval([$1],
[AC_ARG_WITH([system-icu],
AS_HELP_STRING([--with-system-icu],
- [use installed ICU headers and libraries (requires icu-config)]))])[]dnl
+ [use installed ICU headers and libraries (requires pkg-config or icu-config)]))])[]dnl
]) # KPSE_ICU_OPTIONS
# KPSE_ICU_SYSTEM_FLAGS
@@ -48,12 +51,17 @@
# ---------------------
AC_DEFUN([KPSE_ICU_SYSTEM_FLAGS], [dnl
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+echo 'dbg:[_KPSE_ICU_SYSTEM_FLAGS] 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
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath m4_ifset([kpse_icu_config_args],
[kpse_icu_config_args ])--ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+ ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
- AC_MSG_ERROR([did not find icu-config required for system icu libraries])
+ AC_MSG_ERROR([did not find either pkg-config or icu-config; one is required for system icu library support])
fi
]) # KPSE_ICU_SYSTEM_FLAGS
Property changes on: trunk/Build/source/m4/kpse-icu-flags.m4
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id
\ No newline at end of property
Modified: trunk/Build/source/texk/bibtex-x/configure
===================================================================
--- trunk/Build/source/texk/bibtex-x/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/texk/bibtex-x/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1468,7 +1468,7 @@
--with-system-kpathsea use installed kpathsea headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
Some influential environment variables:
CC C compiler command
@@ -19375,7 +19375,8 @@
withval=$with_system_icu;
fi
if test "x$with_system_icu" = xyes; then
- if test -n "$ac_tool_prefix"; then
+ echo 'dbg:_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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -19466,11 +19467,105 @@
else
ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-icuio --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+ ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
- as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+ as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi
else
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
Modified: trunk/Build/source/texk/configure
===================================================================
--- trunk/Build/source/texk/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/texk/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1630,7 +1630,7 @@
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
--with-system-teckit use installed teckit headers and library (requires
pkg-config)
--with-system-graphite2 use installed graphite2 headers and library
Modified: trunk/Build/source/texk/upmendex/configure
===================================================================
--- trunk/Build/source/texk/upmendex/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/texk/upmendex/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1457,7 +1457,7 @@
--with-system-kpathsea use installed kpathsea headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
Some influential environment variables:
CXX C++ compiler command
@@ -19516,7 +19516,8 @@
withval=$with_system_icu;
fi
if test "x$with_system_icu" = xyes; then
- if test -n "$ac_tool_prefix"; then
+ echo 'dbg:_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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -19607,11 +19608,105 @@
else
ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-icuio --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+ ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
- as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+ as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi
else
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
Modified: trunk/Build/source/texk/web2c/configure
===================================================================
--- trunk/Build/source/texk/web2c/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/texk/web2c/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1807,7 +1807,7 @@
--with-system-teckit use installed teckit headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
--with-system-graphite2 use installed graphite2 headers and library
(requires pkg-config)
--with-system-harfbuzz use installed harfbuzz headers and library (requires
@@ -24214,7 +24214,8 @@
withval=$with_system_icu;
fi
if test "x$with_system_icu" = xyes; then
- if test -n "$ac_tool_prefix"; then
+ echo 'dbg:_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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -24305,11 +24306,105 @@
else
ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system`
+elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
+ ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
+ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
elif test "x$need_icu:$with_system_icu" = xyes:yes; then
- as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
+ as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi
else
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
Modified: trunk/Build/source/utils/configure
===================================================================
--- trunk/Build/source/utils/configure 2017-12-07 23:16:26 UTC (rev 46013)
+++ trunk/Build/source/utils/configure 2017-12-07 23:42:12 UTC (rev 46014)
@@ -1630,7 +1630,7 @@
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
--with-system-icu use installed ICU headers and libraries (requires
- icu-config)
+ pkg-config or icu-config)
--with-system-teckit use installed teckit headers and library (requires
pkg-config)
--with-system-graphite2 use installed graphite2 headers and library
More information about the tex-live-commits
mailing list