provide and call new configure option --disable-utf16-string-check, so xetex/bibtexu will compile under gcc 4.4+; tlbuild 7 Apr 2010 15:34:47

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

8 files changed, 117 insertions, 2 deletions

diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index af481a56f2a..488b12bd89d 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-08  Karl Berry  <karl@tug.org>
+
+	* configure.ac: Pass new option --disable-utf16-string-check.
+
 2010-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapted to the ICU 4.4 distribution.
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index c38408ef7e9..593c51f049f 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -2348,6 +2348,11 @@ fi
 # Add '--disable-dyload': neither XeTeX nor BibTeXU use plugins, new in ICU 4.4.
 icu_config="$icu_config --disable-strict --disable-threads --disable-dyload"
 
+# Add '--disable-utf16-string-check': gcc 4.4+ supports this, but
+# XeTeX/BibTeXU don't need it, and propagating the necessary compiler
+# flags as computed by ICU is not easy.
+icu_config="$icu_config --disable-utf16-string-check"
+
 
 if test "x$cross_compiling" = xyes; then
   icu_native_args="--build=$build_alias --host=$build_alias"
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index de6c50aa145..fe2f43c93a8 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -37,6 +37,11 @@ fi
 # Add '--disable-threads': required for FreeBSD, neither XeTeX nor BibTeXU use threads.
 # Add '--disable-dyload': neither XeTeX nor BibTeXU use plugins, new in ICU 4.4.
 icu_config="$icu_config --disable-strict --disable-threads --disable-dyload"
+
+# Add '--disable-utf16-string-check': gcc 4.4+ supports this, but
+# XeTeX/BibTeXU don't need it, and propagating the necessary compiler
+# flags as computed by ICU is not easy.
+icu_config="$icu_config --disable-utf16-string-check"
 AC_SUBST([icu_config])
 
 if test "x$cross_compiling" = xyes; then
diff --git a/Build/source/libs/icu/icu-4.4-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.4-PATCHES/ChangeLog
index bd178df8de6..2d47f4855ca 100644
--- a/Build/source/libs/icu/icu-4.4-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-4.4-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-08  Karl Berry  <karl@tug.org>
+
+	* patch-07-configure-utf16-string: new patch so we can disable the
+	check for UTF16 string literals.  See comments in our
+	libs/icu/configure.ac.
+
 2010-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported icu-4.4 source tree (icu4c-4_4-src.tgz) from:
@@ -155,4 +161,3 @@
 
 	* layout/OpenTypeLayoutEngine.cpp: Removed some obsolete code,
 	surrounded by #if 0...#endif.
-	
diff --git a/Build/source/libs/icu/icu-4.4-PATCHES/TL-Changes b/Build/source/libs/icu/icu-4.4-PATCHES/TL-Changes
index f71198067a3..c92506ba7ce 100644
--- a/Build/source/libs/icu/icu-4.4-PATCHES/TL-Changes
+++ b/Build/source/libs/icu/icu-4.4-PATCHES/TL-Changes
@@ -1,6 +1,10 @@
 Changes applied to the icu-4.4/ tree as obtained from:
 	http://download.icu-project.org/files/icu4c/4.4/icu4c-4_4-src.tgz
 
+Regenerated:
+	configure -- must use autoconf 2.63.  (Installed in
+	            /usr/local/gnu/autoconf-2.63 on tug.org.)
+
 Updated:
 	source/config.guess
 	source/config.sub
diff --git a/Build/source/libs/icu/icu-4.4-PATCHES/patch-07-configure-utf16-string b/Build/source/libs/icu/icu-4.4-PATCHES/patch-07-configure-utf16-string
new file mode 100644
index 00000000000..096127ef389
--- /dev/null
+++ b/Build/source/libs/icu/icu-4.4-PATCHES/patch-07-configure-utf16-string
@@ -0,0 +1,42 @@
+  new --enable option so we can disable the check for UTF16 string literals.
+  See comments in our libs/icu/configure.ac.
+
+--- icu-4.4.orig/source/configure.in	2010-03-30 13:21:43.000000000 +0200
++++ icu-4.4/source/configure.in	2010-04-08 20:31:07.000000000 +0200
+@@ -963,7 +963,28 @@
+ fi
+ AC_SUBST(U_SIZEOF_WCHAR_T)
+ 
++AC_MSG_CHECKING([whether to check for UTF-16 string literal support])
++enabled=yes
++U_ENABLE_UTF16_STRING_CHECK=1
++AC_ARG_ENABLE(utf16-string-check,
++    [  --enable-utf16-string-check enable testing for UTF-16 string literal support [default=yes]],
++    [ case "${enableval}" in
++	     yes|"") enabled=yes; U_ENABLE_UTF16_STRING_CHECK=1 ;;
++	     no) enabled=no; U_ENABLE_UTF16_STRING_CHECK=0 ;;
++	     *) ;;
++    esac],
++)
++AC_MSG_RESULT($enabled)
++AC_SUBST(U_ENABLE_UTF16_STRING_CHECK)
++
++
+ AC_MSG_CHECKING([for UTF-16 string literal support])
++if test $U_ENABLE_UTF16_STRING_CHECK = 0; then
++U_CHECK_UTF16_STRING=0
++U_CHECK_GNUC_UTF16_STRING=0
++CHECK_UTF16_STRING_RESULT="check disabled"
++
++else # do the UTF16 literal checks
+ U_CHECK_UTF16_STRING=1
+ CHECK_UTF16_STRING_RESULT="unknown"
+ 
+@@ -1048,6 +1069,7 @@
+         fi
+     fi
+ fi
++fi
+ AC_SUBST(U_CHECK_GNUC_UTF16_STRING)
+ 
+ AC_MSG_RESULT($CHECK_UTF16_STRING_RESULT)
diff --git a/Build/source/libs/icu/icu-4.4/configure b/Build/source/libs/icu/icu-4.4/configure
index c91b1cc6f77..307ba397164 100755
--- a/Build/source/libs/icu/icu-4.4/configure
+++ b/Build/source/libs/icu/icu-4.4/configure
@@ -656,6 +656,7 @@ ICUIO_TRUE
 EXTRAS_TRUE
 U_CHECK_UTF16_STRING
 U_CHECK_GNUC_UTF16_STRING
+U_ENABLE_UTF16_STRING_CHECK
 U_SIZEOF_WCHAR_T
 U_HAVE_WCSCPY
 U_HAVE_WCHAR_H
@@ -804,6 +805,7 @@ enable_rpath
 enable_threads
 enable_weak_threads
 with_iostream
+enable_utf16_string_check
 enable_extras
 enable_icuio
 enable_layout
@@ -1462,6 +1464,7 @@ Optional Features:
   --enable-rpath          use rpath when linking default is only if necessary
   --enable-threads        build ICU with thread safety default=yes
   --enable-weak-threads   weakly reference the threading library default=no
+  --enable-utf16-string-check enable testing for UTF-16 string literal support default=yes
   --enable-extras         build ICU extras default=yes
   --enable-icuio          build ICU's icuio library default=yes
   --enable-layout         build ICU's layout library default=yes
@@ -10979,8 +10982,32 @@ $as_echo "$as_me: error: There is wchar.h but the size of wchar_t is 0" >&2;}
 fi
 
 
+{ $as_echo "$as_me:$LINENO: checking whether to check for UTF-16 string literal support" >&5
+$as_echo_n "checking whether to check for UTF-16 string literal support... " >&6; }
+enabled=yes
+U_ENABLE_UTF16_STRING_CHECK=1
+# Check whether --enable-utf16-string-check was given.
+if test "${enable_utf16_string_check+set}" = set; then
+  enableval=$enable_utf16_string_check;  case "${enableval}" in
+	     yes|"") enabled=yes; U_ENABLE_UTF16_STRING_CHECK=1 ;;
+	     no) enabled=no; U_ENABLE_UTF16_STRING_CHECK=0 ;;
+	     *) ;;
+    esac
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $enabled" >&5
+$as_echo "$enabled" >&6; }
+
+
+
 { $as_echo "$as_me:$LINENO: checking for UTF-16 string literal support" >&5
 $as_echo_n "checking for UTF-16 string literal support... " >&6; }
+if test $U_ENABLE_UTF16_STRING_CHECK = 0; then
+U_CHECK_UTF16_STRING=0
+U_CHECK_GNUC_UTF16_STRING=0
+CHECK_UTF16_STRING_RESULT="check disabled"
+
+else # do the UTF16 literal checks
 U_CHECK_UTF16_STRING=1
 CHECK_UTF16_STRING_RESULT="unknown"
 
@@ -11188,6 +11215,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
     fi
 fi
+fi
 
 
 { $as_echo "$as_me:$LINENO: result: $CHECK_UTF16_STRING_RESULT" >&5
@@ -12164,7 +12192,7 @@ $debug ||
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr=`echo X |tr X "\015"`
+ac_cr='
'
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
diff --git a/Build/source/libs/icu/icu-4.4/configure.in b/Build/source/libs/icu/icu-4.4/configure.in
index 6289fa2c91b..aef320e7680 100644
--- a/Build/source/libs/icu/icu-4.4/configure.in
+++ b/Build/source/libs/icu/icu-4.4/configure.in
@@ -963,7 +963,28 @@ if test $U_SIZEOF_WCHAR_T = 0; then
 fi
 AC_SUBST(U_SIZEOF_WCHAR_T)
 
+AC_MSG_CHECKING([whether to check for UTF-16 string literal support])
+enabled=yes
+U_ENABLE_UTF16_STRING_CHECK=1
+AC_ARG_ENABLE(utf16-string-check,
+    [  --enable-utf16-string-check enable testing for UTF-16 string literal support [default=yes]],
+    [ case "${enableval}" in
+	     yes|"") enabled=yes; U_ENABLE_UTF16_STRING_CHECK=1 ;;
+	     no) enabled=no; U_ENABLE_UTF16_STRING_CHECK=0 ;;
+	     *) ;;
+    esac],
+)
+AC_MSG_RESULT($enabled)
+AC_SUBST(U_ENABLE_UTF16_STRING_CHECK)
+
+
 AC_MSG_CHECKING([for UTF-16 string literal support])
+if test $U_ENABLE_UTF16_STRING_CHECK = 0; then
+U_CHECK_UTF16_STRING=0
+U_CHECK_GNUC_UTF16_STRING=0
+CHECK_UTF16_STRING_RESULT="check disabled"
+
+else # do the UTF16 literal checks
 U_CHECK_UTF16_STRING=1
 CHECK_UTF16_STRING_RESULT="unknown"
 
@@ -1048,6 +1069,7 @@ GCC IS TOO OLD!
         fi
     fi
 fi
+fi
 AC_SUBST(U_CHECK_GNUC_UTF16_STRING)
 
 AC_MSG_RESULT($CHECK_UTF16_STRING_RESULT)