summaryrefslogtreecommitdiff
path: root/Build/source/texk/upmendex/configure
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-12 00:09:34 +0000
committerKarl Berry <karl@freefriends.org>2016-02-12 00:09:34 +0000
commitd919899eca62f55138eb1fcf3eafcb15a1a27de1 (patch)
tree7a44711f612a7f35dc8cfd10d46f290a67f6e210 /Build/source/texk/upmendex/configure
parentf71cfa07f0a8ed6f832fc3fcf3b93fd43a799ae5 (diff)
reautoconf with current autotools
git-svn-id: svn://tug.org/texlive/trunk@39668 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/upmendex/configure')
-rwxr-xr-xBuild/source/texk/upmendex/configure9
1 files changed, 4 insertions, 5 deletions
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index 41db1a7e099..5f9b9159ffb 100755
--- a/Build/source/texk/upmendex/configure
+++ b/Build/source/texk/upmendex/configure
@@ -14957,6 +14957,7 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
fi
## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
+
# Check whether --with-system-icu was given.
if test "${with_system_icu+set}" = set; then :
withval=$with_system_icu;
@@ -15055,16 +15056,14 @@ else
fi
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
- # Work around bug in icu-config version 4.4
- ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath `
- ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`"
+ ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-icuio --ldflags-libsonly --ldflags-system`
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
fi
else
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
- ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicui18n.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
- ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicui18n.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
+ ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicuio.a $kpse_BLD/libs/icu/icu-build/lib/libicui18n.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
+ ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicuio.a ${top_builddir}/../../libs/icu/icu-build/lib/libicui18n.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
ICU_RULE='# Rebuild libicuxxx
$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild