diff options
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/libs/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/libs/configure | 19 | ||||
-rw-r--r-- | Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes | 5 |
4 files changed, 26 insertions, 0 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index f051eedc8c5..42b54777d7e 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../m4/kpse-setup.m4 \ diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index 7931fe41449..8d3167a2f5b 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/aclocal.m4 @@ -684,6 +684,7 @@ m4_include([../m4/kpse-graphite-flags.m4]) m4_include([../m4/kpse-icu-flags.m4]) m4_include([../m4/kpse-kpathsea-flags.m4]) m4_include([../m4/kpse-libpng-flags.m4]) +m4_include([../m4/kpse-lt-hack.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-setup.m4]) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 4d06dc30fc9..95c8891dff3 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -640,6 +640,7 @@ enable_all_pkgs enable_native_texlive_build enable_multiplatform enable_cxx_runtime_hack +enable_libtool_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1398,6 +1399,7 @@ Optional Features: --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM --enable-cxx-runtime-hack link C++ runtime statically + --enable-libtool-hack ignore libtool dependency_libs --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2112,6 +2114,18 @@ esac ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; esac fi +case $enable_libtool_hack in #( + yes | no) : + : ;; #( + *) : + case $host_os in #( + linux* | solaris*) : + enable_libtool_hack=yes ;; #( + *) : + enable_libtool_hack=no ;; +esac + ac_configure_args="$ac_configure_args '--enable-libtool-hack=$enable_libtool_hack'" ;; +esac case $enable_shared in #( no) : : ;; #( @@ -2152,6 +2166,11 @@ if test "${enable_cxx_runtime_hack+set}" = set; then : enableval=$enable_cxx_runtime_hack; fi +# Check whether --enable-libtool-hack was given. +if test "${enable_libtool_hack+set}" = set; then : + enableval=$enable_libtool_hack; +fi + case $with_x in #( diff --git a/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes b/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes index b5affa2e3b6..7090fd322f4 100644 --- a/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes +++ b/Build/source/libs/icu/icu-4.2.1-PATCHES/TL-Changes @@ -13,3 +13,8 @@ Run the shell script fix-case-insensitive to rename source/layout/Features.h => ICUFeatures.h and modify references to that file accordingly. +Removed empty dirs: + layout/unicode + test/perf/results + tools/cpysearch + |