diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-12 10:46:26 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-12 10:46:26 +0000 |
commit | 2634a06a7d85815f202849726ca952e4f7b02a63 (patch) | |
tree | eca16b4d9e4db99169d70490552e0c8f85613a05 /Build/source/texk/upmendex/configure | |
parent | 923ea82eab46a4005634b9820bd1a1321a35c1a3 (diff) |
texk/upmendex: build system fix by Luigi
git-svn-id: svn://tug.org/texlive/trunk@39691 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/upmendex/configure')
-rwxr-xr-x | Build/source/texk/upmendex/configure | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure index 5f9b9159ffb..41db1a7e099 100755 --- a/Build/source/texk/upmendex/configure +++ b/Build/source/texk/upmendex/configure @@ -14957,7 +14957,6 @@ 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; @@ -15056,14 +15055,16 @@ else 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` + # 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`" 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/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_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_RULE='# Rebuild libicuxxx $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild |