7 files changed, 27 insertions, 23 deletions
diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog
index 36d9befcaf5..81b08a51f1a 100644
--- a/Build/source/libs/ChangeLog
+++ b/Build/source/libs/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: XeTeX can now be built with unmodified libicu*.
+
 2012-12-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_BASIC to enable silent rules.
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index c93d51b7a2b..c6837c4de97 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live libs 2012.
+# Generated by GNU Autoconf 2.69 for TeX Live libs 2013.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live libs'
 PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2012'
-PACKAGE_STRING='TeX Live libs 2012'
+PACKAGE_VERSION='2013'
+PACKAGE_STRING='TeX Live libs 2013'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live libs 2012 to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2013 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live libs 2012:";;
+     short | recursive ) echo "Configuration of TeX Live libs 2013:";;
    esac
   cat <<\_ACEOF
 
@@ -1640,7 +1640,7 @@ Optional Packages:
   --with-system-harfbuzz  use installed harfbuzz headers and library (requires
                           pkg-config)
   --with-system-icu       use installed ICU headers and libraries (requires
-                          icu-config, not for XeTeX)
+                          icu-config)
   --with-system-teckit    use installed teckit headers and library
   --with-teckit-includes=DIR
                           teckit headers installed in DIR
@@ -1764,7 +1764,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live libs configure 2012
+TeX Live libs configure 2013
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1865,7 +1865,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live libs $as_me 2012, which was
+It was created by TeX Live libs $as_me 2013, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5900,7 +5900,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live-libs'
- VERSION='2012'
+ VERSION='2013'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6188,7 +6188,6 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 $as_echo_n "checking for generic libraries to build... " >&6; }
 SUBLIBS=
 DIST_SUBLIBS=
-test "x$need_icu_xetex" = xyes && need_icu=yes && with_system_icu=no
 
 
 
@@ -6965,7 +6964,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live libs $as_me 2012, which was
+This file was extended by TeX Live libs $as_me 2013, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7022,7 +7021,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live libs config.status 2012
+TeX Live libs config.status 2013
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/configure.ac b/Build/source/libs/configure.ac
index 3bec40cd18b..650c99dae9c 100644
--- a/Build/source/libs/configure.ac
+++ b/Build/source/libs/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([TeX Live libs], [2012], [tex-k@tug.org])
+AC_INIT([TeX Live libs], [2013], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([../build-aux/missing])
 AC_CONFIG_AUX_DIR([../build-aux])
@@ -22,9 +22,6 @@ AC_PROG_MKDIR_P
 AC_MSG_CHECKING([for generic libraries to build])
 SUBLIBS=
 DIST_SUBLIBS=
-dnl XeTeX needs the ICU headers and libraries from the TL tree,
-dnl whereas bibtexu may use installed ICU headers and libraries.
-test "x$need_icu_xetex" = xyes && need_icu=yes && with_system_icu=no
 KPSE_FOR_PKGS([libs], [
 if test -x $srcdir/Kpse_Pkg/configure; then
   if test "x$with_system_[]Kpse_pkg" != xyes && \
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index 9110243b246..f5db637e1b8 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -1472,7 +1472,7 @@ Optional Packages:
   --with-system-freetype2 use installed freetype2 headers and library
                           (requires freetype-config)
   --with-system-icu       use installed ICU headers and libraries (requires
-                          icu-config, not for XeTeX)
+                          icu-config)
   --with-system-graphite2 use installed graphite2 headers and library
                           (requires pkg-config)
 
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index e1d93fd8f74..612a2b08f15 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Always disable the layout library.
+
 2012-12-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: When cross compiling disable the native layout
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index 59f5da50e26..2f4acb62c16 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -3653,11 +3653,11 @@ if test "x$cache_file" != x/dev/null; then
 fi
 # Add '--disable-strict': required for MinGW32, otherwise reduce warnings.
 # Add '--disable-dyload': neither XeTeX nor BibTeXU use plugins, new in ICU 4.4.
-icu_config="$icu_config --disable-strict --disable-dyload"
+icu_config="$icu_config --disable-strict --disable-dyload --disable-layout"
 
 
 if test "x$cross_compiling" = xyes; then
-  icu_native_args="--build=$build_alias --host=$build_alias --disable-layout --disable-icuio"
+  icu_native_args="--build=$build_alias --host=$build_alias --disable-icuio"
   icu_build_args="--build=$build_alias --host=$host_alias --with-cross-build='\${abs_builddir}'/icu-native"
 else
   icu_build_args="--build=$kpse_build_alias"
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index 71f13c5dd83..c9ae25772a4 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -35,11 +35,11 @@ if test "x$cache_file" != x/dev/null; then
 fi
 # Add '--disable-strict': required for MinGW32, otherwise reduce warnings.
 # Add '--disable-dyload': neither XeTeX nor BibTeXU use plugins, new in ICU 4.4.
-icu_config="$icu_config --disable-strict --disable-dyload"
+icu_config="$icu_config --disable-strict --disable-dyload --disable-layout"
 AC_SUBST([icu_config])
 
 if test "x$cross_compiling" = xyes; then
-  icu_native_args="--build=$build_alias --host=$build_alias --disable-layout --disable-icuio"
+  icu_native_args="--build=$build_alias --host=$build_alias --disable-icuio"
   icu_build_args="--build=$build_alias --host=$host_alias --with-cross-build='\${abs_builddir}'/icu-native"
 else
   icu_build_args="--build=$kpse_build_alias"