organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-7622 Merge r27939 for ticket #7615.

Browse source 
X-SVN-Rev: 27944
This commit is contained in:
Michael Ow 2010-04-16 19:58:54 +00:00
parent 450a56525c
commit e8871ba80f
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/configure vendored
View file

@ -1477,7 +1477,7 @@ Optional Packages:
--with-cross-build=dir specify an absolute path to the build directory of an ICU built for the current platform default=no cross dir
--with-library-bits=bits specify how many bits to use for the library (32, 64, 64else32, nochange) default=nochange
--with-iostream=version specify the version of iostream to use (none, old, std, auto) default=auto
--with-data-packaging=type specify how to package ICU data (files, archive, library, auto) default=auto
--with-data-packaging=type specify how to package ICU data (files, archive, library, static, auto) default=auto
--with-library-suffix=suffix tag a suffix to the library names default=
Some influential environment variables:
@ -11284,7 +11284,13 @@ thepkgicudatadir=$thedatadir
if test x"$datapackaging" = x -o x"$datapackaging" = xauto; then
# default to library
datapackaging=library
if test "$ENABLE_STATIC" = "YES"; then
if test "$ENABLE_SHARED" != "YES"; then
datapackaging=static
fi
fi
fi
datapackaging_dir=`eval echo $thedatadir`"/icu/${VERSION}"

8
source/configure.in
View file

@ -1085,7 +1085,7 @@ AC_ARG_ENABLE(layout,
ICU_CONDITIONAL(LAYOUT, test "$layout" = true)
AC_ARG_WITH(data-packaging,
[ --with-data-packaging=type specify how to package ICU data (files, archive, library, auto) [default=auto]],
[ --with-data-packaging=type specify how to package ICU data (files, archive, library, static, auto) [default=auto]],
[case "${withval}" in
files|archive|library) datapackaging=$withval ;;
auto) datapackaging=$withval ;;
@ -1112,7 +1112,13 @@ AC_SUBST(thepkgicudatadir)
dnl# Shouldn't need the AC_SUBST
if test x"$datapackaging" = x -o x"$datapackaging" = xauto; then
# default to library
datapackaging=library
if test "$ENABLE_STATIC" = "YES"; then
if test "$ENABLE_SHARED" != "YES"; then
datapackaging=static
fi
fi
fi
datapackaging_dir=`eval echo $thedatadir`"/icu/${VERSION}"

4
source/test/cintltst/Makefile.in
View file

@ -1,6 +1,6 @@
#******************************************************************************
#
# Copyright (C) 1999-2009, International Business Machines
# Copyright (C) 1999-2010, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@ -38,7 +38,7 @@ endif
# we define ICU_UNICODE_VERSION so we can test it
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil
DEFS += -D'ICU_UNICODE_VERSION="$(UNICODE_VERSION)"' -D'ICU_VERSION="@VERSION@"' -D'ICUDATA_NAME="$(ICUDATA_PLATFORM_NAME)"' -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = callcoll.o calltest.o colutil.o capitst.o cbiapts.o cbkittst.o \
ccaltst.o ucnvseltst.o cctest.o ccapitst.o ccolltst.o encoll.o cconvtst.o ccurrtst.o \