source/configure - Issue 1621843002: ICU 56 update step 1

Unified Diff: source/configure

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561

Patch Set: Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/configure

diff --git a/source/configure b/source/configure

index c8c50f5b76bbd49fcddafbceaca8a88b6c2b515a..d48f7b8f739d55994877763ca51171ff4796211d 100755

--- a/source/configure

+++ b/source/configure

@@ -1,10 +1,10 @@

#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.69 for ICU 54.1.

+# Generated by GNU Autoconf 2.69 for ICU 56.1.

# Report bugs to <http://icu-project.org/bugs>.

@@ -582,8 +582,8 @@ MAKEFLAGS=

# Identity of this package.

PACKAGE_NAME='ICU'

PACKAGE_TARNAME='International Components for Unicode'

-PACKAGE_VERSION='54.1'

-PACKAGE_STRING='ICU 54.1'

+PACKAGE_VERSION='56.1'

+PACKAGE_STRING='ICU 56.1'

PACKAGE_BUGREPORT='http://icu-project.org/bugs'

PACKAGE_URL='http://icu-project.org'

@@ -635,7 +635,9 @@ platform_make_fragment

platform_make_fragment_name

platform

ICUDATA_CHAR

+U_HAVE_SAMPLES

SAMPLES_TRUE

+U_HAVE_TESTS

TESTS_TRUE

ICULIBSUFFIXCNAME

U_HAVE_LIB_SUFFIX

@@ -643,10 +645,15 @@ ICULIBSUFFIX

DATA_PACKAGING_MODE

thepkgicudatadir

pkgicudatadir

+U_HAVE_TOOLS

TOOLS_TRUE

+U_HAVE_LAYOUTEX

LAYOUTEX_TRUE

+U_HAVE_LAYOUT

LAYOUT_TRUE

+U_HAVE_ICUIO

ICUIO_TRUE

+U_HAVE_EXTRAS

EXTRAS_TRUE

U_HAVE_WCSCPY

U_HAVE_WCHAR_H

@@ -671,6 +678,8 @@ U_HAVE_ATOMIC

U_HAVE_STD_STRING

ENABLE_RPATH

U_ENABLE_DYLOAD

+U_HAVE_PLUGINS

+PLUGINS_TRUE

U_ENABLE_TRACING

U_DISABLE_RENAMING

@@ -694,6 +703,8 @@ INSTALL_PROGRAM

CPP

ICULEHB_LIBS

ICULEHB_CFLAGS

+PKG_CONFIG_LIBDIR

+PKG_CONFIG_PATH

PKG_CONFIG

ac_ct_CXX

CXXFLAGS

@@ -776,6 +787,7 @@ enable_auto_cleanup

enable_draft

enable_renaming

enable_tracing

+enable_plugins

enable_dyload

enable_rpath

enable_weak_threads

@@ -801,6 +813,8 @@ CXX

CXXFLAGS

CCC

PKG_CONFIG

+PKG_CONFIG_PATH

+PKG_CONFIG_LIBDIR

ICULEHB_CFLAGS

ICULEHB_LIBS

CPP'

@@ -1344,7 +1358,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 ICU 54.1 to adapt to many kinds of systems.

+\`configure' configures ICU 56.1 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1410,7 +1424,7 @@ fi

if test -n "$ac_init_help"; then

case $ac_init_help in

- short | recursive ) echo "Configuration of ICU 54.1:";;

+ short | recursive ) echo "Configuration of ICU 56.1:";;

esac

cat <<\_ACEOF

@@ -1428,6 +1442,7 @@ Optional Features:

--enable-draft enable draft APIs (and internal APIs) default=yes

--enable-renaming add a version suffix to symbols default=yes

--enable-tracing enable function and data tracing default=no

+ --enable-plugins enable plugins default=no

--disable-dyload disable dynamic loading default=no

--enable-rpath use rpath when linking default is only if necessary

--enable-weak-threads weakly reference the threading library default=no

@@ -1469,6 +1484,10 @@ Some influential environment variables:

CXX C++ compiler command

CXXFLAGS C++ compiler flags

PKG_CONFIG path to pkg-config utility

+ PKG_CONFIG_PATH

+ directories to add to pkg-config's search path

+ PKG_CONFIG_LIBDIR

+ path overriding pkg-config's built-in search path

ICULEHB_CFLAGS

C compiler flags for ICULEHB, overriding pkg-config

ICULEHB_LIBS

@@ -1542,14 +1561,14 @@ fi

test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

cat <<\_ACEOF

-ICU configure 54.1

+ICU configure 56.1

generated by GNU Autoconf 2.69

This configure script is free software; the Free Software Foundation

gives unlimited permission to copy, distribute and modify it.

_ACEOF

exit

@@ -2234,7 +2253,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 ICU $as_me 54.1, which was

+It was created by ICU $as_me 56.1, which was

generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@

@@ -3667,6 +3686,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

# pkg-config is needed for harfbuzz support

if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

if test -n "$ac_tool_prefix"; then

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

@@ -3779,7 +3803,6 @@ $as_echo "yes" >&6; }

$as_echo "no" >&6; }

PKG_CONFIG=""

pkg_failed=no

@@ -3796,6 +3819,7 @@ if test -n "$ICULEHB_CFLAGS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_ICULEHB_CFLAGS=`$PKG_CONFIG --cflags "icu-le-hb" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -3812,6 +3836,7 @@ if test -n "$ICULEHB_LIBS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_ICULEHB_LIBS=`$PKG_CONFIG --libs "icu-le-hb" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -3822,6 +3847,8 @@ fi

if test $pkg_failed = yes; then

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

_pkg_short_errors_supported=yes

@@ -3829,17 +3856,17 @@ else

_pkg_short_errors_supported=no

if test $_pkg_short_errors_supported = yes; then

- ICULEHB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "icu-le-hb" 2>&1`

+ ICULEHB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-le-hb" 2>&1`

else

- ICULEHB_PKG_ERRORS=`$PKG_CONFIG --print-errors "icu-le-hb" 2>&1`

+ ICULEHB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-le-hb" 2>&1`

# Put the nasty error message in config.log where it belongs

echo "$ICULEHB_PKG_ERRORS" >&5

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

- :

+ :

elif test $pkg_failed = untried; then

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

else

ICULEHB_CFLAGS=$pkg_cv_ICULEHB_CFLAGS

@@ -5682,10 +5709,37 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then

CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";

+# Enable/disable plugins

+# Check whether --enable-plugins was given.

+if test "${enable_plugins+set}" = set; then :

+ enableval=$enable_plugins; case "${enableval}" in

+ yes) plugins=true ;;

+ no) plugins=false ;;

+ *) as_fn_error $? "bad value ${enableval} for --enable-plugins" "$LINENO" 5 ;;

+ esac

+else

+ plugins=false

+fi

+if test "$plugins" = true; then

+ PLUGINS_TRUE=

+ U_HAVE_PLUGINS=1

+else

+ PLUGINS_TRUE='#'

+ U_HAVE_PLUGINS=0

+fi

+if test "x$plugins" = "xtrue"; then

+ UCONFIG_CPPFLAGS="$UCONFIG_CPPFLAGS -DUCONFIG_ENABLE_PLUGINS=1"

+fi

U_ENABLE_DYLOAD=1

enable=yes

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5

-$as_echo_n "checking whether to enable dynamic loading of plugins... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5

+$as_echo_n "checking whether to enable dynamic loading of plugins. Ignored if plugins disabled.... " >&6; }

# Check whether --enable-dyload was given.

if test "${enable_dyload+set}" = set; then :

enableval=$enable_dyload; case "${enableval}" in

@@ -5968,18 +6022,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

# Always build ICU with multi-threading support.

-threads=true

-ICU_USE_THREADS=1

OLD_LIBS=${LIBS}

-if test $threads = true; then

- # For Compaq Tru64 (OSF1), we must look for pthread_attr_init

- # and must do this before seaching for pthread_mutex_destroy, or

- # we will pick up libpthreads.so not libpthread.so

- # If this fails, then we must test for HPUX specials, before

- # moving on to a more generic test

+# For Compaq Tru64 (OSF1), we must look for pthread_attr_init

+# and must do this before seaching for pthread_mutex_destroy, or

+# we will pick up libpthreads.so not libpthread.so

+# If this fails, then we must test for HPUX specials, before

+# moving on to a more generic test

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5

$as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }

if ${ac_cv_lib_pthread_pthread_attr_init+:} false; then :

$as_echo_n "(cached) " >&6

@@ -6024,14 +6075,14 @@ _ACEOF

- if test $ac_cv_lib_pthread_pthread_attr_init = yes; then

- ICU_USE_THREADS=1

- else

- # Locate the right library for POSIX threads. We look for the

- # symbols in the libraries first, because on Solaris libc provides

- # pthread_create but libpthread has the real code :(

- # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread

- # FreeBSD users may need libpthread if they do not have libc_r.

+if test $ac_cv_lib_pthread_pthread_attr_init = yes; then

+ :

+else

+ # Locate the right library for POSIX threads. We look for the

+ # symbols in the libraries first, because on Solaris libc provides

+ # pthread_create but libpthread has the real code :(

+ # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread

+ # FreeBSD users may need libpthread if they do not have libc_r.

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutex_destroy" >&5

@@ -6104,11 +6155,11 @@ else :

- if test "$ac_cv_search_pthread_mutex_destroy" != no; then

- ICU_USE_THREADS=1

- else

- # For HP 11

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5

+ if test "$ac_cv_search_pthread_mutex_destroy" != no; then

+ :

+ else

+ # For HP 11

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5

$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }

if ${ac_cv_lib_pthread_pthread_mutex_init+:} false; then :

$as_echo_n "(cached) " >&6

@@ -6153,51 +6204,50 @@ _ACEOF

- if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then

- ICU_USE_THREADS=1

- fi

+ if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then

+ :

+ fi

- ac_fn_c_check_func "$LINENO" "pthread_mutex_lock" "ac_cv_func_pthread_mutex_lock"

+ ac_fn_c_check_func "$LINENO" "pthread_mutex_lock" "ac_cv_func_pthread_mutex_lock"

if test "x$ac_cv_func_pthread_mutex_lock" = xyes; then :

- if test $ac_cv_func_pthread_mutex_lock = yes; then

- ICU_USE_THREADS=1

- fi

+ if test $ac_cv_func_pthread_mutex_lock = yes; then

+ :

- # Check to see if we are using CygWin with MSVC

- case "${host}" in

- *-pc-cygwin*|*-pc-mingw*)

- # For gcc, the thread options are set by mh-mingw/mh-cygwin

- # For msvc, the thread options are set by runConfigureICU

- ICU_USE_THREADS=1

- ;;

- *-*-hpux*)

- # Add -mt because it does several nice things on newer compilers.

- case "${icu_cv_host_frag}" in

- mh-hpux-acc)

- OLD_CXXFLAGS="${CXXFLAGS}"

- CXXFLAGS="${CXXFLAGS} -mt"

- if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then

- CXXFLAGS="${OLD_CXXFLAGS}"

- else

- UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt"

- fi

- ;;

- esac

+fi

+# Check to see if we are using CygWin with MSVC

+case "${host}" in

+*-pc-cygwin*|*-pc-mingw*)

+ # For gcc, the thread options are set by mh-mingw/mh-cygwin

+ # For msvc, the thread options are set by runConfigureICU

+ :

+ ;;

+*-*-hpux*)

+ # Add -mt because it does several nice things on newer compilers.

+ case "${icu_cv_host_frag}" in

+ mh-hpux-acc)

+ OLD_CXXFLAGS="${CXXFLAGS}"

+ CXXFLAGS="${CXXFLAGS} -mt"

+ if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then

+ CXXFLAGS="${OLD_CXXFLAGS}"

+ else

+ UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt"

+ fi

;;

- *-*-solaris*)

- case "${icu_cv_host_frag}" in

- mh-solaris)

- LIBS="${LIBS} -mt"

- ;;

- esac

+ esac

+ ;;

+*-*-solaris*)

+ case "${icu_cv_host_frag}" in

+ mh-solaris)

+ LIBS="${LIBS} -mt"

;;

esac

-fi

+ ;;

+esac

# Check whether --enable-weak-threads was given.

if test "${enable_weak_threads+set}" = set; then :

@@ -6285,7 +6335,10 @@ sparc-*-solaris*)

GENCCODE_ASSEMBLY="-a sun"

;;

ia64-*-hpux*)

- GENCCODE_ASSEMBLY="-a aCC-ia64"

+# There has been some issues with building ICU data on HPUX ia64 aCC

+# when using the assemble code setting below. For now, build without

+# assemble code for this platform. This will increase the build time.

+# GENCCODE_ASSEMBLY="-a aCC-ia64"

;;

esac

@@ -7427,10 +7480,13 @@ else

if test "$extras" = true; then

EXTRAS_TRUE=

+ U_HAVE_EXTRAS=1

else

EXTRAS_TRUE='#'

+ U_HAVE_EXTRAS=0

# Check whether --enable-icuio was given.

if test "${enable_icuio+set}" = set; then :

@@ -7444,10 +7500,13 @@ else

if test "$icuio" = true; then

ICUIO_TRUE=

+ U_HAVE_ICUIO=1

else

ICUIO_TRUE='#'

+ U_HAVE_ICUIO=0

# Enable/disable layout

@@ -7463,10 +7522,13 @@ else

if test "$layout" = true; then

LAYOUT_TRUE=

+ U_HAVE_LAYOUT=1

else

LAYOUT_TRUE='#'

+ U_HAVE_LAYOUT=0

# Enable/disable layoutex

@@ -7482,10 +7544,13 @@ else

if test "$layoutex" = true; then

LAYOUTEX_TRUE=

+ U_HAVE_LAYOUTEX=1

else

LAYOUTEX_TRUE='#'

+ U_HAVE_LAYOUTEX=0

# Enable/disable tools

@@ -7501,10 +7566,13 @@ else

if test "$tools" = true; then

TOOLS_TRUE=

+ U_HAVE_TOOLS=1

else

TOOLS_TRUE='#'

+ U_HAVE_TOOLS=0

@@ -7623,10 +7691,13 @@ else

if test "$tests" = true; then

TESTS_TRUE=

+ U_HAVE_TESTS=1

else

TESTS_TRUE='#'

+ U_HAVE_TESTS=0

# Enable/disable samples

@@ -7642,10 +7713,13 @@ else

if test "$samples" = true; then

SAMPLES_TRUE=

+ U_HAVE_SAMPLES=1

else

SAMPLES_TRUE='#'

+ U_HAVE_SAMPLES=0

ICUDATA_CHAR=$U_ENDIAN_CHAR

@@ -8264,7 +8338,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 ICU $as_me 54.1, which was

+This file was extended by ICU $as_me 56.1, which was

generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES

@@ -8318,7 +8392,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="\\

-ICU config.status 54.1

+ICU config.status 56.1

configured by $0, generated by GNU Autoconf 2.69,

with options \\"\$ac_cs_config\\"

« no previous file with comments | « source/config/mh-aix-gcc ('k') | source/configure.ac » ('j') | no next file with comments »