| Index: source/configure.ac
|
| diff --git a/source/configure.ac b/source/configure.ac
|
| index 595bd122cee88d62e38dbffd8266dd55eb81d78c..44503623fbd4f082069c1741cdba1092fce6a452 100644
|
| --- a/source/configure.ac
|
| +++ b/source/configure.ac
|
| @@ -1,5 +1,6 @@
|
| # -*-autoconf-*-
|
| -AC_COPYRIGHT([ Copyright (c) 1999-2015, International Business Machines Corporation and others. All Rights Reserved. ])
|
| +AC_COPYRIGHT([ Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html ])
|
| +# AC_COPYRIGHT([ Copyright (c) 1999-2015, International Business Machines Corporation and others. All Rights Reserved. ])
|
| # configure.in for ICU
|
| # Stephen F. Booth, heavily modified by Yves and others
|
|
|
| @@ -505,6 +506,11 @@ if [[ "$GXX" = yes ]]; then
|
| else
|
| CXXFLAGS="$OLD_CXXFLAGS"
|
| fi
|
| + case "${host}" in
|
| + *-*-solaris*)
|
| + CXXFLAGS="$OLD_CXXFLAGS"
|
| + ;;
|
| + esac
|
| fi
|
| fi
|
|
|
| @@ -887,6 +893,17 @@ fi
|
| AC_SUBST(U_HAVE_TIMEZONE)
|
| AC_SUBST(U_TIMEZONE)
|
|
|
| +AC_CHECK_FUNC(strtod_l)
|
| +if test x$ac_cv_func_strtod_l = xyes
|
| +then
|
| + CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=1"
|
| + U_HAVE_STRTOD_L=1
|
| +else
|
| + CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=0"
|
| + U_HAVE_STRTOD_L=0
|
| +fi
|
| +AC_SUBST(U_HAVE_STRTOD_L)
|
| +
|
| # Checks for typedefs
|
| AC_CHECK_TYPE(int8_t,signed char)
|
| AC_CHECK_TYPE(uint8_t,unsigned char)
|
| @@ -1080,30 +1097,28 @@ AC_ARG_ENABLE(icuio,
|
| icuio=true)
|
| ICU_CONDITIONAL(ICUIO, test "$icuio" = true)
|
|
|
| -# Enable/disable layout
|
| -AC_ARG_ENABLE(layout,
|
| - [ --enable-layout build ICU's DEPRECATED layout library [default=yes]],
|
| - [case "${enableval}" in
|
| - yes) layout=true ;;
|
| - no) layout=false ;;
|
| - *) AC_MSG_ERROR(bad value ${enableval} for --enable-layout) ;;
|
| - esac],
|
| - layout=true)
|
| -ICU_CONDITIONAL(LAYOUT, test "$layout" = true)
|
| -
|
| # Enable/disable layoutex
|
| AC_ARG_ENABLE(layoutex,
|
| - [ --enable-layoutex build ICU's Paragraph Layout library [default=same-as-layout].
|
| - If not building with the ICU Layout library, then icu-le-hb must be installed via pkg-config.
|
| - See http://harfbuzz.org],
|
| + [ --enable-layoutex build ICU's Paragraph Layout library [default=yes].
|
| + icu-le-hb must be installed via pkg-config. See http://harfbuzz.org],
|
| [case "${enableval}" in
|
| - yes) layoutex=true ;;
|
| + yes) layoutex=$have_icu_le_hb ;;
|
| no) layoutex=false ;;
|
| *) AC_MSG_ERROR(bad value ${enableval} for --enable-layoutex) ;;
|
| esac],
|
| - layoutex=$layout)
|
| + layoutex=$have_icu_le_hb)
|
| ICU_CONDITIONAL(LAYOUTEX, test "$layoutex" = true)
|
|
|
| +# Enable/disable layout
|
| +AC_ARG_ENABLE(layout,
|
| + [],
|
| + [case "${enableval}" in
|
| + yes) AC_MSG_ERROR(The ICU Layout Engine has been removed.) ;;
|
| + no) ;;
|
| + *) ;;
|
| + esac],
|
| + )
|
| +
|
| # Enable/disable tools
|
| AC_ARG_ENABLE(tools,
|
| [ --enable-tools build ICU's tools [default=yes]],
|
| @@ -1325,7 +1340,6 @@ AC_CONFIG_FILES([icudefs.mk \
|
| stubdata/Makefile \
|
| common/Makefile \
|
| i18n/Makefile \
|
| - layout/Makefile \
|
| layoutex/Makefile \
|
| io/Makefile \
|
| extra/Makefile \
|
|
|