summaryrefslogtreecommitdiff
path: root/Build/source/texk/bibtexu
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-05-09 09:22:03 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-05-09 09:22:03 +0000
commitc480472da1f8567417f7bb083ec6047b23c5db9f (patch)
tree09ca47deb67be3c8859b0f12e077dd4e169c5183 /Build/source/texk/bibtexu
parent32db0daad9f37a2b83bb5efb624eae3ea72e2470 (diff)
icu build: Always use libicuxxx, not libsicuxxx
git-svn-id: svn://tug.org/texlive/trunk@22373 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/bibtexu')
-rwxr-xr-xBuild/source/texk/bibtexu/configure9
1 files changed, 2 insertions, 7 deletions
diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure
index f669f3b5cef..bf008dd1857 100755
--- a/Build/source/texk/bibtexu/configure
+++ b/Build/source/texk/bibtexu/configure
@@ -760,7 +760,6 @@ with_sysroot
enable_libtool_lock
enable_largefile
enable_compiler_warnings
-with_gnu_ld
enable_cxx_runtime_hack
with_system_kpathsea
with_kpathsea_includes
@@ -776,12 +775,8 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
-CPPFLAGS
CXX
CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
CCC
CXXCPP'
@@ -18384,10 +18379,10 @@ else
ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
- ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicuio.a BLD/libs/icu/icu-build/lib/libsicui18n.a BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
+ ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libicuio.a BLD/libs/icu/icu-build/lib/libicui18n.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
- ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicuio.a BLD/libs/icu/icu-build/lib/libsicui18n.a BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
+ ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libicuio.a BLD/libs/icu/icu-build/lib/libicui18n.a BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a' | sed \
-e 's,BLD/,${top_builddir}/../../,g'`
ICU_RULE='# Rebuild libicuxxx
$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h