diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-04 08:13:00 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-04 08:13:00 +0000 |
| commit | eba910adcf713a6905cb891a0eacb93d03f467c4 (patch) | |
| tree | b0860c4ef13c4c7da8ac19918fee684531ba7391 /Build/source/libs/icu | |
| parent | 6cc553b4ef0a05f7d7af76d2e6eda6ff8c8ef76d (diff) | |
various cleanups for the new XeTeX
git-svn-id: svn://tug.org/texlive/trunk@28724 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu')
| -rw-r--r-- | Build/source/libs/icu/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/libs/icu/configure | 4 | ||||
| -rw-r--r-- | Build/source/libs/icu/configure.ac | 6 |
3 files changed, 9 insertions, 5 deletions
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" |