libs/icu: build without threads

git-svn-id: svn://tug.org/texlive/trunk@17546 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 17 insertions, 10 deletions

diff --git a/Build/source/Build b/Build/source/Build
index 9ab7ecfb7a9..66bebc7ae22 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -78,9 +78,6 @@ cd $TL_WORKDIR || exit 1
 # default to terminate if requested programs or features must be disabled.
 : ${TL_CONF_MISSING=--disable-missing}
 
-# default to building ICU without thread support, since xetex doesn't need it.
-: ${TL_CONF_THREADS=--disable-threads}
-
 # allow override of xdvi toolkit, default to standard xaw.
 : ${TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw}
 
@@ -110,7 +107,6 @@ cd $TL_WORKDIR || exit 1
         $TL_CONF_SHARED \
         $TL_CONF_MISSING \
         $TL_CONF_LARGEFILE \
-        $TL_CONF_THREADS \
         $TL_CONF_XDVI_TOOLKIT \
         $TL_CONFIGURE_ARGS \
         "$@" \
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index fbf57134cad..eb4dc7282ee 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Build (TL_CONF_THREADS): Removed, now in libs/icu/configure.
+
 2010-03-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (triptrap): Run intermediate triptrap target in
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index ce1923efde8..646fd68e3ec 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Pass '--disable-threads' to ICU configure:
+	required for FreeBSD, neither XeTeX nor BibTeXU use threads.
+
 2010-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Pass '--disable-strict' to ICU configure:
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index a5396e269f8..ec9dcee8b68 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -2343,8 +2343,9 @@ icu_config="$icu_config --disable-extras --disable-samples --disable-tests"
 if test "x$cache_file" != x/dev/null; then
   icu_config="$icu_config -C"
 fi
-# Required for MinGW32, otherwise reduced warnings.
-icu_config="$icu_config --disable-strict"
+# Add '--disable-strict': required for MinGW32, otherwise reduce warnings.
+# Add '--disable-threads': required for FreeBSD, neither XeTeX nor BibTeXU use threads.
+icu_config="$icu_config --disable-strict --disable-threads"
 
 
 if test "x$cross_compiling" = xyes; then
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index bc9997b711b..356396054c5 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -33,8 +33,9 @@ icu_config="$icu_config --disable-extras --disable-samples --disable-tests"
 if test "x$cache_file" != x/dev/null; then
   icu_config="$icu_config -C"
 fi
-# Required for MinGW32, otherwise reduced warnings.
-icu_config="$icu_config --disable-strict"
+# Add '--disable-strict': required for MinGW32, otherwise reduce warnings.
+# Add '--disable-threads': required for FreeBSD, neither XeTeX nor BibTeXU use threads.
+icu_config="$icu_config --disable-strict --disable-threads"
 AC_SUBST([icu_config])
 
 if test "x$cross_compiling" = xyes; then
diff --git a/Build/source/texk/web2c/bibtex.ch b/Build/source/texk/web2c/bibtex.ch
index d0ffdf20852..8a4a7bc7784 100644
--- a/Build/source/texk/web2c/bibtex.ch
+++ b/Build/source/texk/web2c/bibtex.ch
@@ -205,7 +205,7 @@ end.
 @y [still 14]
 @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
 @!POOL_SIZE=65000; {initial number of characters in strings}
-@!MAX_STRINGS=4000; {minimum initial value for |max_strings|}
+@!MAX_STRINGS=4000; {minimum value for |max_strings|}
 @!MAX_CITES=750; {initial number of distinct cite keys; must be
                                                         |<=max_strings|}
 @!WIZ_FN_SPACE=3000; {initial amount of |wiz_defined|-function space}
@@ -238,7 +238,7 @@ end.
 @x [still 14]
 @!lit_stk_size=100; {maximum number of literal functions on the stack}
 @y
-@!LIT_STK_SIZE=50; {maximum number of literal functions on the stack}
+@!LIT_STK_SIZE=50; {initial space for literal functions on the stack}
 @z
 
 @x [15] Increase more constants in the web defines.