Index: source/configure |
diff --git a/source/configure b/source/configure |
index 88b56cbae6a33a45a9d61cce54f3e12a9b1e0eaf..ae789aa262153910c8f359d4955101777e4ec0bc 100755 |
--- a/source/configure |
+++ b/source/configure |
@@ -1,13 +1,13 @@ |
#! /bin/sh |
# Guess values for system-dependent variables and create Makefiles. |
-# Generated by GNU Autoconf 2.68. |
+# Generated by GNU Autoconf 2.69 for ICU 54.1. |
# |
-# Copyright (c) 1999-2013, International Business Machines Corporation and others. All Rights Reserved. |
+# Report bugs to <http://icu-project.org/bugs>. |
# |
+# Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved. |
# |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
-# Foundation, Inc. |
+# |
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
# |
# |
# This configure script is free software; the Free Software Foundation |
@@ -136,6 +136,31 @@ export LANGUAGE |
# CDPATH. |
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
+# Use a proper internal environment variable to ensure we don't fall |
+ # into an infinite loop, continuously re-executing ourselves. |
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
+ _as_can_reexec=no; export _as_can_reexec; |
+ # We cannot yet assume a decent shell, so we have to provide a |
+# neutralization value for shells without unset; and this also |
+# works around shells that cannot unset nonexistent variables. |
+# Preserve -v and -x to the replacement shell. |
+BASH_ENV=/dev/null |
+ENV=/dev/null |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
+case $- in # (((( |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
+ *v* ) as_opts=-v ;; |
+ *x* ) as_opts=-x ;; |
+ * ) as_opts= ;; |
+esac |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
+# Admittedly, this is quite paranoid, since all the known shells bail |
+# out after a failed `exec'. |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
+as_fn_exit 255 |
+ fi |
+ # We don't want this to propagate to other subprocesses. |
+ { _as_can_reexec=; unset _as_can_reexec;} |
if test "x$CONFIG_SHELL" = x; then |
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
emulate sh |
@@ -169,7 +194,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : |
else |
exitcode=1; echo positional parameters were not saved. |
fi |
-test x\$exitcode = x0 || exit 1" |
+test x\$exitcode = x0 || exit 1 |
+test -x / || exit 1" |
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
@@ -214,21 +240,25 @@ IFS=$as_save_IFS |
if test "x$CONFIG_SHELL" != x; then : |
- # We cannot yet assume a decent shell, so we have to provide a |
- # neutralization value for shells without unset; and this also |
- # works around shells that cannot unset nonexistent variables. |
- # Preserve -v and -x to the replacement shell. |
- BASH_ENV=/dev/null |
- ENV=/dev/null |
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
- export CONFIG_SHELL |
- case $- in # (((( |
- *v*x* | *x*v* ) as_opts=-vx ;; |
- *v* ) as_opts=-v ;; |
- *x* ) as_opts=-x ;; |
- * ) as_opts= ;; |
- esac |
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
+ export CONFIG_SHELL |
+ # We cannot yet assume a decent shell, so we have to provide a |
+# neutralization value for shells without unset; and this also |
+# works around shells that cannot unset nonexistent variables. |
+# Preserve -v and -x to the replacement shell. |
+BASH_ENV=/dev/null |
+ENV=/dev/null |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
+case $- in # (((( |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
+ *v* ) as_opts=-v ;; |
+ *x* ) as_opts=-x ;; |
+ * ) as_opts= ;; |
+esac |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
+# Admittedly, this is quite paranoid, since all the known shells bail |
+# out after a failed `exec'. |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
+exit 255 |
fi |
if test x$as_have_required = xno; then : |
@@ -238,7 +268,8 @@ fi |
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" |
$as_echo "$0: be upgraded to zsh 4.3.4 or later." |
else |
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, |
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and |
+$0: http://icu-project.org/bugs about your system, |
$0: including any error possibly output before this |
$0: message. Then install a modern shell, or manually run |
$0: the script under such a shell if you do have one." |
@@ -330,6 +361,14 @@ $as_echo X"$as_dir" | |
} # as_fn_mkdir_p |
+ |
+# as_fn_executable_p FILE |
+# ----------------------- |
+# Test if FILE is an executable regular file. |
+as_fn_executable_p () |
+{ |
+ test -f "$1" && test -x "$1" |
+} # as_fn_executable_p |
# as_fn_append VAR VALUE |
# ---------------------- |
# Append the text in VALUE to the end of the definition contained in VAR. Take |
@@ -451,6 +490,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits |
chmod +x "$as_me.lineno" || |
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
+ # already done that, so ensure we don't try to do so again and fall |
+ # in an infinite loop. This has already happened in practice. |
+ _as_can_reexec=no; export _as_can_reexec |
# Don't try to exec as it changes $[0], causing all sort of problems |
# (the dirname of $[0] is not the place where we might find the |
# original and so on. Autoconf is especially sensitive to this). |
@@ -485,16 +528,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
# ... but there are two gotchas: |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
- # In both cases, we have to default to `cp -p'. |
+ # In both cases, we have to default to `cp -pR'. |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
- as_ln_s='cp -p' |
+ as_ln_s='cp -pR' |
elif ln conf$$.file conf$$ 2>/dev/null; then |
as_ln_s=ln |
else |
- as_ln_s='cp -p' |
+ as_ln_s='cp -pR' |
fi |
else |
- as_ln_s='cp -p' |
+ as_ln_s='cp -pR' |
fi |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
rmdir conf$$.dir 2>/dev/null |
@@ -506,28 +549,8 @@ else |
as_mkdir_p=false |
fi |
-if test -x / >/dev/null 2>&1; then |
- as_test_x='test -x' |
-else |
- if ls -dL / >/dev/null 2>&1; then |
- as_ls_L_option=L |
- else |
- as_ls_L_option= |
- fi |
- as_test_x=' |
- eval sh -c '\'' |
- if test -d "$1"; then |
- test -d "$1/."; |
- else |
- case $1 in #( |
- -*)set "./$1";; |
- esac; |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
- ???[sx]*):;;*)false;;esac;fi |
- '\'' sh |
- ' |
-fi |
-as_executable_p=$as_test_x |
+as_test_x='test -x' |
+as_executable_p=as_fn_executable_p |
# Sed expression to map a string onto a valid CPP name. |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
@@ -557,14 +580,13 @@ MFLAGS= |
MAKEFLAGS= |
# Identity of this package. |
-PACKAGE_NAME= |
-PACKAGE_TARNAME= |
-PACKAGE_VERSION= |
-PACKAGE_STRING= |
-PACKAGE_BUGREPORT= |
-PACKAGE_URL= |
- |
-ac_unique_file="ICU" |
+PACKAGE_NAME='ICU' |
+PACKAGE_TARNAME='International Components for Unicode' |
+PACKAGE_VERSION='54.1' |
+PACKAGE_STRING='ICU 54.1' |
+PACKAGE_BUGREPORT='http://icu-project.org/bugs' |
+PACKAGE_URL='http://icu-project.org' |
+ |
ac_unique_file="common/unicode/utypes.h" |
# Factoring default headers for most tests. |
ac_includes_default="\ |
@@ -622,6 +644,7 @@ DATA_PACKAGING_MODE |
thepkgicudatadir |
pkgicudatadir |
TOOLS_TRUE |
+LAYOUTEX_TRUE |
LAYOUT_TRUE |
ICUIO_TRUE |
EXTRAS_TRUE |
@@ -669,6 +692,9 @@ INSTALL_DATA |
INSTALL_SCRIPT |
INSTALL_PROGRAM |
CPP |
+ICULEHB_LIBS |
+ICULEHB_CFLAGS |
+PKG_CONFIG |
ac_ct_CXX |
CXXFLAGS |
CXX |
@@ -756,6 +782,7 @@ enable_weak_threads |
enable_extras |
enable_icuio |
enable_layout |
+enable_layoutex |
enable_tools |
with_data_packaging |
with_library_suffix |
@@ -773,6 +800,9 @@ CPPFLAGS |
CXX |
CXXFLAGS |
CCC |
+PKG_CONFIG |
+ICULEHB_CFLAGS |
+ICULEHB_LIBS |
CPP' |
@@ -814,7 +844,7 @@ sharedstatedir='${prefix}/com' |
localstatedir='${prefix}/var' |
includedir='${prefix}/include' |
oldincludedir='/usr/include' |
-docdir='${datarootdir}/doc/${PACKAGE}' |
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' |
infodir='${datarootdir}/info' |
htmldir='${docdir}' |
dvidir='${docdir}' |
@@ -1229,8 +1259,6 @@ target=$target_alias |
if test "x$host_alias" != x; then |
if test "x$build_alias" = x; then |
cross_compiling=maybe |
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
- If a cross compiler is detected then cross compile mode will be used" >&2 |
elif test "x$build_alias" != "x$host_alias"; then |
cross_compiling=yes |
fi |
@@ -1316,7 +1344,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 this package to adapt to many kinds of systems. |
+\`configure' configures ICU 54.1 to adapt to many kinds of systems. |
Usage: $0 [OPTION]... [VAR=VALUE]... |
@@ -1364,7 +1392,8 @@ Fine tuning of the installation directories: |
--infodir=DIR info documentation [DATAROOTDIR/info] |
--localedir=DIR locale-dependent data [DATAROOTDIR/locale] |
--mandir=DIR man documentation [DATAROOTDIR/man] |
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] |
+ --docdir=DIR documentation root [DATAROOTDIR/doc/International |
+ Components for Unicode] |
--htmldir=DIR html documentation [DOCDIR] |
--dvidir=DIR dvi documentation [DOCDIR] |
--pdfdir=DIR pdf documentation [DOCDIR] |
@@ -1380,7 +1409,9 @@ _ACEOF |
fi |
if test -n "$ac_init_help"; then |
- |
+ case $ac_init_help in |
+ short | recursive ) echo "Configuration of ICU 54.1:";; |
+ esac |
cat <<\_ACEOF |
Optional Features: |
@@ -1402,7 +1433,10 @@ Optional Features: |
--enable-weak-threads weakly reference the threading library default=no |
--enable-extras build ICU extras default=yes |
--enable-icuio build ICU's icuio library default=yes |
- --enable-layout build ICU's layout library default=yes |
+ --enable-layout build ICU's DEPRECATED layout library default=yes |
+ --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-tools build ICU's tools default=yes |
--enable-tests build ICU tests default=yes |
--enable-samples build ICU samples default=yes |
@@ -1415,7 +1449,13 @@ Optional Packages: |
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
--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-data-packaging=type specify how to package ICU data (files, archive, library, static, auto) default=auto |
+ --with-data-packaging specify how to package ICU data. Possible values: |
+ files raw files (.res, etc) |
+ archive build a single icudtXX.dat file |
+ library shared library (.dll/.so/etc.) |
+ static static library (.a/.lib/etc.) |
+ auto build shared if possible (default) |
+ See http://userguide.icu-project.org/icudata for more info. |
--with-library-suffix=suffix tag a suffix to the library names default= |
Some influential environment variables: |
@@ -1428,12 +1468,18 @@ Some influential environment variables: |
you have headers in a nonstandard directory <include dir> |
CXX C++ compiler command |
CXXFLAGS C++ compiler flags |
+ PKG_CONFIG path to pkg-config utility |
+ ICULEHB_CFLAGS |
+ C compiler flags for ICULEHB, overriding pkg-config |
+ ICULEHB_LIBS |
+ linker flags for ICULEHB, overriding pkg-config |
CPP C preprocessor |
Use these variables to override the choices made by `configure' or to help |
it to find libraries and programs with nonstandard names/locations. |
-Report bugs to the package provider. |
+Report bugs to <http://icu-project.org/bugs>. |
+ICU home page: <http://icu-project.org>. |
_ACEOF |
ac_status=$? |
fi |
@@ -1496,14 +1542,14 @@ fi |
test -n "$ac_init_help" && exit $ac_status |
if $ac_init_version; then |
cat <<\_ACEOF |
-configure |
-generated by GNU Autoconf 2.68 |
+ICU configure 54.1 |
+generated by GNU Autoconf 2.69 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
+Copyright (C) 2012 Free Software Foundation, Inc. |
This configure script is free software; the Free Software Foundation |
gives unlimited permission to copy, distribute and modify it. |
- Copyright (c) 1999-2013, International Business Machines Corporation and others. All Rights Reserved. |
+ Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved. |
_ACEOF |
exit |
fi |
@@ -1652,7 +1698,7 @@ $as_echo "$ac_try_echo"; } >&5 |
test ! -s conftest.err |
} && test -s conftest$ac_exeext && { |
test "$cross_compiling" = yes || |
- $as_test_x conftest$ac_exeext |
+ test -x conftest$ac_exeext |
}; then : |
ac_retval=0 |
else |
@@ -1730,7 +1776,8 @@ int |
main () |
{ |
static int test_array [1 - 2 * !(($2) >= 0)]; |
-test_array [0] = 0 |
+test_array [0] = 0; |
+return test_array [0]; |
; |
return 0; |
@@ -1746,7 +1793,8 @@ int |
main () |
{ |
static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
-test_array [0] = 0 |
+test_array [0] = 0; |
+return test_array [0]; |
; |
return 0; |
@@ -1772,7 +1820,8 @@ int |
main () |
{ |
static int test_array [1 - 2 * !(($2) < 0)]; |
-test_array [0] = 0 |
+test_array [0] = 0; |
+return test_array [0]; |
; |
return 0; |
@@ -1788,7 +1837,8 @@ int |
main () |
{ |
static int test_array [1 - 2 * !(($2) >= $ac_mid)]; |
-test_array [0] = 0 |
+test_array [0] = 0; |
+return test_array [0]; |
; |
return 0; |
@@ -1822,7 +1872,8 @@ int |
main () |
{ |
static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
-test_array [0] = 0 |
+test_array [0] = 0; |
+return test_array [0]; |
; |
return 0; |
@@ -1949,7 +2000,7 @@ $as_echo "$ac_try_echo"; } >&5 |
test ! -s conftest.err |
} && test -s conftest$ac_exeext && { |
test "$cross_compiling" = yes || |
- $as_test_x conftest$ac_exeext |
+ test -x conftest$ac_exeext |
}; then : |
ac_retval=0 |
else |
@@ -2038,6 +2089,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} |
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
+( $as_echo "## ------------------------------------------ ## |
+## Report this to http://icu-project.org/bugs ## |
+## ------------------------------------------ ##" |
+ ) | sed "s/^/$as_me: WARNING: /" >&2 |
;; |
esac |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
@@ -2179,8 +2234,8 @@ 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 $as_me, which was |
-generated by GNU Autoconf 2.68. Invocation command line was |
+It was created by ICU $as_me 54.1, which was |
+generated by GNU Autoconf 2.69. Invocation command line was |
$ $0 $@ |
@@ -2528,12 +2583,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
-#TODO: IcuBug:8502 |
-#AC_INIT([ICU], |
-# m4_esyscmd_s([sed -n 's/^[ ]*#[ ]*define[ ]*U_ICU_VERSION[ ]*"\([^"]*\)".*/\1/p' "./common/unicode/uvernum.h]"), |
-# [http://icu-project.org/bugs], |
-# [International Components for Unicode], |
-# [http://icu-project.org]) |
@@ -2782,7 +2831,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -2826,7 +2875,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_ac_ct_CC="$ac_prog" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -3270,8 +3319,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
#include <stdarg.h> |
#include <stdio.h> |
-#include <sys/types.h> |
-#include <sys/stat.h> |
+struct stat; |
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
struct buf { int x; }; |
FILE * (*rcsopen) (struct buf *, struct stat *, int); |
@@ -3386,7 +3434,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -3430,7 +3478,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_ac_ct_CXX="$ac_prog" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -3616,6 +3664,191 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ |
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. |
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
+$as_echo_n "checking for $ac_word... " >&6; } |
+if ${ac_cv_path_PKG_CONFIG+:} false; then : |
+ $as_echo_n "(cached) " >&6 |
+else |
+ case $PKG_CONFIG in |
+ [\\/]* | ?:[\\/]*) |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
+ ;; |
+ *) |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
+for as_dir in $PATH |
+do |
+ IFS=$as_save_IFS |
+ test -z "$as_dir" && as_dir=. |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
+ break 2 |
+ fi |
+done |
+ done |
+IFS=$as_save_IFS |
+ |
+ ;; |
+esac |
+fi |
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
+if test -n "$PKG_CONFIG"; then |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
+$as_echo "$PKG_CONFIG" >&6; } |
+else |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
+$as_echo "no" >&6; } |
+fi |
+ |
+ |
+fi |
+if test -z "$ac_cv_path_PKG_CONFIG"; then |
+ ac_pt_PKG_CONFIG=$PKG_CONFIG |
+ # Extract the first word of "pkg-config", so it can be a program name with args. |
+set dummy pkg-config; ac_word=$2 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
+$as_echo_n "checking for $ac_word... " >&6; } |
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
+ $as_echo_n "(cached) " >&6 |
+else |
+ case $ac_pt_PKG_CONFIG in |
+ [\\/]* | ?:[\\/]*) |
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
+ ;; |
+ *) |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
+for as_dir in $PATH |
+do |
+ IFS=$as_save_IFS |
+ test -z "$as_dir" && as_dir=. |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
+ break 2 |
+ fi |
+done |
+ done |
+IFS=$as_save_IFS |
+ |
+ ;; |
+esac |
+fi |
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
+if test -n "$ac_pt_PKG_CONFIG"; then |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
+$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
+else |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
+$as_echo "no" >&6; } |
+fi |
+ |
+ if test "x$ac_pt_PKG_CONFIG" = x; then |
+ PKG_CONFIG="" |
+ else |
+ case $cross_compiling:$ac_tool_warned in |
+yes:) |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
+ac_tool_warned=yes ;; |
+esac |
+ PKG_CONFIG=$ac_pt_PKG_CONFIG |
+ fi |
+else |
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
+fi |
+ |
+fi |
+if test -n "$PKG_CONFIG"; then |
+ _pkg_min_version=0.20 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
+$as_echo "yes" >&6; } |
+ else |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
+$as_echo "no" >&6; } |
+ PKG_CONFIG="" |
+ fi |
+ |
+fi |
+ |
+pkg_failed=no |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICULEHB" >&5 |
+$as_echo_n "checking for ICULEHB... " >&6; } |
+ |
+if test -n "$ICULEHB_CFLAGS"; then |
+ pkg_cv_ICULEHB_CFLAGS="$ICULEHB_CFLAGS" |
+ elif test -n "$PKG_CONFIG"; then |
+ if test -n "$PKG_CONFIG" && \ |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-le-hb\""; } >&5 |
+ ($PKG_CONFIG --exists --print-errors "icu-le-hb") 2>&5 |
+ ac_status=$? |
+ $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` |
+else |
+ pkg_failed=yes |
+fi |
+ else |
+ pkg_failed=untried |
+fi |
+if test -n "$ICULEHB_LIBS"; then |
+ pkg_cv_ICULEHB_LIBS="$ICULEHB_LIBS" |
+ elif test -n "$PKG_CONFIG"; then |
+ if test -n "$PKG_CONFIG" && \ |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-le-hb\""; } >&5 |
+ ($PKG_CONFIG --exists --print-errors "icu-le-hb") 2>&5 |
+ ac_status=$? |
+ $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` |
+else |
+ pkg_failed=yes |
+fi |
+ else |
+ pkg_failed=untried |
+fi |
+ |
+ |
+ |
+if test $pkg_failed = yes; then |
+ |
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
+ _pkg_short_errors_supported=yes |
+else |
+ _pkg_short_errors_supported=no |
+fi |
+ if test $_pkg_short_errors_supported = yes; then |
+ ICULEHB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "icu-le-hb" 2>&1` |
+ else |
+ ICULEHB_PKG_ERRORS=`$PKG_CONFIG --print-errors "icu-le-hb" 2>&1` |
+ fi |
+ # 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 |
+ : |
+else |
+ ICULEHB_CFLAGS=$pkg_cv_ICULEHB_CFLAGS |
+ ICULEHB_LIBS=$pkg_cv_ICULEHB_LIBS |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
+$as_echo "yes" >&6; } |
+ have_icu_le_hb=true |
+fi |
+ |
# Ensure that if CXXFLAGS/CFLAGS were not set when calling configure, set it correctly based on (enable/disable) debug or release option |
# The release mode use is the default one for autoconf |
if test "$GCC" = yes; then |
@@ -3812,7 +4045,7 @@ case $as_dir/ in #(( |
# by default. |
for ac_prog in ginstall scoinst install; do |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
if test $ac_prog = install && |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
# AIX install. It has an incompatible calling convention. |
@@ -3933,7 +4166,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_path_U_MAKE="$as_dir/$ac_word$ac_exec_ext" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -4009,7 +4242,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -4083,9 +4316,6 @@ $as_echo "$ac_use_strict_options" >&6; } |
if test "$GCC" = yes |
then |
case "${host}" in |
- *-*-solaris*) |
- # Don't use -std=c99 option on Solaris/GCC |
- ;; |
*) |
# Do not use -ansi. It limits us to C90, and it breaks some platforms. |
# We use -std=c99 to disable the gnu99 defaults and its associated warnings |
@@ -4100,7 +4330,9 @@ $as_echo "$ac_use_strict_options" >&6; } |
if test "`$CC /help 2>&1 | head -c9`" = "Microsoft" |
then |
CFLAGS="$CFLAGS /W4" |
- fi |
+ fi ;; |
+ *-*-mingw*) |
+ CFLAGS="$CFLAGS -W4" ;; |
esac |
fi |
if test "$GXX" = yes |
@@ -4112,7 +4344,9 @@ $as_echo "$ac_use_strict_options" >&6; } |
if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft" |
then |
CXXFLAGS="$CXXFLAGS /W4" |
- fi |
+ fi ;; |
+ *-*-mingw*) |
+ CFLAGS="$CFLAGS -W4" ;; |
esac |
fi |
fi |
@@ -4137,7 +4371,7 @@ do |
for ac_prog in grep ggrep; do |
for ac_exec_ext in '' $ac_executable_extensions; do |
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
+ as_fn_executable_p "$ac_path_GREP" || continue |
# Check for GNU ac_path_GREP and select it if it is found. |
# Check for GNU $ac_path_GREP |
case `"$ac_path_GREP" --version 2>&1` in |
@@ -4203,7 +4437,7 @@ do |
for ac_prog in egrep; do |
for ac_exec_ext in '' $ac_executable_extensions; do |
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
+ as_fn_executable_p "$ac_path_EGREP" || continue |
# Check for GNU ac_path_EGREP and select it if it is found. |
# Check for GNU $ac_path_EGREP |
case `"$ac_path_EGREP" --version 2>&1` in |
@@ -4578,7 +4812,7 @@ fi |
if test "$CAN_BUILD_64" != yes; then |
# Nope. back out changes. |
CFLAGS="${CFLAGS_OLD}" |
- CXXFLAGS="${CFLAGS_OLD}" |
+ CXXFLAGS="${CXXFLAGS_OLD}" |
# 2. try xarch=v9 [deprecated] |
## TODO: cross compile: the following won't work. |
SPARCV9=`isainfo -n 2>&1 | grep sparcv9` |
@@ -4873,24 +5107,21 @@ powerpc*-*-linux*) |
icu_cv_host_frag=mh-linux-va |
fi ;; |
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;; |
-*-*-cygwin|*-*-mingw32|*-*-mingw64) |
+i[34567]86-*-cygwin) |
if test "$GCC" = yes; then |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
-/* end confdefs.h. */ |
- |
-#ifndef __MINGW32__ |
-#error This is not MinGW |
-#endif |
-int |
-main () |
-{ |
- |
- ; |
- return 0; |
-} |
-_ACEOF |
-if ac_fn_c_try_compile "$LINENO"; then : |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
+ icu_cv_host_frag=mh-cygwin |
+ else |
+ icu_cv_host_frag=mh-cygwin-msvc |
+ fi ;; |
+x86_64-*-cygwin) |
+ if test "$GCC" = yes; then |
+ icu_cv_host_frag=mh-cygwin64 |
+ else |
+ icu_cv_host_frag=mh-cygwin-msvc |
+ fi ;; |
+*-*-mingw*) |
+ if test "$GCC" = yes; then |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
#ifndef __MINGW64__ |
@@ -4910,12 +5141,11 @@ else |
icu_cv_host_frag=mh-mingw |
fi |
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
-else |
- icu_cv_host_frag=mh-cygwin |
-fi |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
else |
- icu_cv_host_frag=mh-cygwin-msvc |
+ case "${host}" in |
+ *-*-mingw*) icu_cv_host_frag=mh-msys-msvc ;; |
+ *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;; |
+ esac |
fi ;; |
*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;; |
*-*-aix*) |
@@ -5157,7 +5387,7 @@ $as_echo "$enabled" >&6; } |
MSVC_RELEASE_FLAG="" |
if test $enabled = yes |
then |
- if test $icu_cv_host_frag = mh-cygwin-msvc |
+ if test $icu_cv_host_frag = mh-cygwin-msvc -o $icu_cv_host_frag = mh-msys-msvc |
then |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
@@ -5227,7 +5457,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -5267,7 +5497,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_ac_ct_RANLIB="ranlib" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -5321,7 +5551,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_AR="${ac_tool_prefix}ar" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -5361,7 +5591,7 @@ do |
IFS=$as_save_IFS |
test -z "$as_dir" && as_dir=. |
for ac_exec_ext in '' $ac_executable_extensions; do |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
ac_cv_prog_ac_ct_AR="ar" |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
break 2 |
@@ -7239,6 +7469,25 @@ else |
LAYOUT_TRUE='#' |
fi |
+# Enable/disable layoutex |
+# Check whether --enable-layoutex was given. |
+if test "${enable_layoutex+set}" = set; then : |
+ enableval=$enable_layoutex; case "${enableval}" in |
+ yes) layoutex=true ;; |
+ no) layoutex=false ;; |
+ *) as_fn_error $? "bad value ${enableval} for --enable-layoutex" "$LINENO" 5 ;; |
+ esac |
+else |
+ layoutex=$layout |
+fi |
+ |
+ |
+if test "$layoutex" = true; then |
+ LAYOUTEX_TRUE= |
+else |
+ LAYOUTEX_TRUE='#' |
+fi |
+ |
# Enable/disable tools |
# Check whether --enable-tools was given. |
if test "${enable_tools+set}" = set; then : |
@@ -7470,7 +7719,7 @@ echo "CXXFLAGS=$CXXFLAGS" |
# output the Makefiles |
-ac_config_files="$ac_config_files icudefs.mk Makefile data/pkgdataMakefile config/Makefile.inc config/icu.pc config/pkgdataMakefile data/Makefile stubdata/Makefile common/Makefile i18n/Makefile io/Makefile extra/Makefile extra/uconv/Makefile extra/uconv/pkgdataMakefile extra/scrptrun/Makefile tools/Makefile tools/ctestfw/Makefile tools/toolutil/Makefile tools/makeconv/Makefile tools/genrb/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gendict/Makefile tools/gentest/Makefile tools/gennorm2/Makefile tools/genbrk/Makefile tools/gensprep/Makefile tools/icuinfo/Makefile tools/icupkg/Makefile tools/icuswap/Makefile tools/pkgdata/Makefile tools/tzcode/Makefile tools/gencfu/Makefile test/Makefile test/compat/Makefile test/testdata/Makefile test/testdata/pkgdataMakefile test/hdrtst/Makefile test/intltest/Makefile test/cintltst/Makefile test/iotest/Makefile test/letest/Makefile test/perf/Makefile test/perf/collationperf/Makefile test/perf/collperf/Makefile test/perf/dicttrieperf/Makefile test/perf/ubrkperf/Makefile test/perf/charperf/Makefile test/perf/convperf/Makefile test/perf/normperf/Makefile test/perf/DateFmtPerf/Makefile test/perf/howExpensiveIs/Makefile test/perf/strsrchperf/Makefile test/perf/unisetperf/Makefile test/perf/usetperf/Makefile test/perf/ustrperf/Makefile test/perf/utfperf/Makefile test/perf/utrie2perf/Makefile test/perf/leperf/Makefile samples/Makefile samples/date/Makefile samples/cal/Makefile samples/layout/Makefile" |
+ac_config_files="$ac_config_files icudefs.mk Makefile data/pkgdataMakefile config/Makefile.inc config/icu.pc config/pkgdataMakefile data/Makefile stubdata/Makefile common/Makefile i18n/Makefile layout/Makefile layoutex/Makefile io/Makefile extra/Makefile extra/uconv/Makefile extra/uconv/pkgdataMakefile extra/scrptrun/Makefile tools/Makefile tools/ctestfw/Makefile tools/toolutil/Makefile tools/makeconv/Makefile tools/genrb/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gendict/Makefile tools/gentest/Makefile tools/gennorm2/Makefile tools/genbrk/Makefile tools/gensprep/Makefile tools/icuinfo/Makefile tools/icupkg/Makefile tools/icuswap/Makefile tools/pkgdata/Makefile tools/tzcode/Makefile tools/gencfu/Makefile test/Makefile test/compat/Makefile test/testdata/Makefile test/testdata/pkgdataMakefile test/hdrtst/Makefile test/intltest/Makefile test/cintltst/Makefile test/iotest/Makefile test/letest/Makefile test/perf/Makefile test/perf/collationperf/Makefile test/perf/collperf/Makefile test/perf/collperf2/Makefile test/perf/dicttrieperf/Makefile test/perf/ubrkperf/Makefile test/perf/charperf/Makefile test/perf/convperf/Makefile test/perf/normperf/Makefile test/perf/DateFmtPerf/Makefile test/perf/howExpensiveIs/Makefile test/perf/strsrchperf/Makefile test/perf/unisetperf/Makefile test/perf/usetperf/Makefile test/perf/ustrperf/Makefile test/perf/utfperf/Makefile test/perf/utrie2perf/Makefile test/perf/leperf/Makefile samples/Makefile samples/date/Makefile samples/cal/Makefile samples/layout/Makefile" |
cat >confcache <<\_ACEOF |
# This file is a shell script that caches the results of configure |
@@ -7916,16 +8165,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
# ... but there are two gotchas: |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
- # In both cases, we have to default to `cp -p'. |
+ # In both cases, we have to default to `cp -pR'. |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
- as_ln_s='cp -p' |
+ as_ln_s='cp -pR' |
elif ln conf$$.file conf$$ 2>/dev/null; then |
as_ln_s=ln |
else |
- as_ln_s='cp -p' |
+ as_ln_s='cp -pR' |
fi |
else |
- as_ln_s='cp -p' |
+ as_ln_s='cp -pR' |
fi |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
rmdir conf$$.dir 2>/dev/null |
@@ -7985,28 +8234,16 @@ else |
as_mkdir_p=false |
fi |
-if test -x / >/dev/null 2>&1; then |
- as_test_x='test -x' |
-else |
- if ls -dL / >/dev/null 2>&1; then |
- as_ls_L_option=L |
- else |
- as_ls_L_option= |
- fi |
- as_test_x=' |
- eval sh -c '\'' |
- if test -d "$1"; then |
- test -d "$1/."; |
- else |
- case $1 in #( |
- -*)set "./$1";; |
- esac; |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
- ???[sx]*):;;*)false;;esac;fi |
- '\'' sh |
- ' |
-fi |
-as_executable_p=$as_test_x |
+ |
+# as_fn_executable_p FILE |
+# ----------------------- |
+# Test if FILE is an executable regular file. |
+as_fn_executable_p () |
+{ |
+ test -f "$1" && test -x "$1" |
+} # as_fn_executable_p |
+as_test_x='test -x' |
+as_executable_p=as_fn_executable_p |
# Sed expression to map a string onto a valid CPP name. |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
@@ -8027,8 +8264,8 @@ 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 $as_me, which was |
-generated by GNU Autoconf 2.68. Invocation command line was |
+This file was extended by ICU $as_me 54.1, which was |
+generated by GNU Autoconf 2.69. Invocation command line was |
CONFIG_FILES = $CONFIG_FILES |
CONFIG_HEADERS = $CONFIG_HEADERS |
@@ -8074,17 +8311,18 @@ Usage: $0 [OPTION]... [TAG]... |
Configuration files: |
$config_files |
-Report bugs to the package provider." |
+Report bugs to <http://icu-project.org/bugs>. |
+ICU home page: <http://icu-project.org>." |
_ACEOF |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
ac_cs_version="\\ |
-config.status |
-configured by $0, generated by GNU Autoconf 2.68, |
+ICU config.status 54.1 |
+configured by $0, generated by GNU Autoconf 2.69, |
with options \\"\$ac_cs_config\\" |
-Copyright (C) 2010 Free Software Foundation, Inc. |
+Copyright (C) 2012 Free Software Foundation, Inc. |
This config.status script is free software; the Free Software Foundation |
gives unlimited permission to copy, distribute and modify it." |
@@ -8162,7 +8400,7 @@ fi |
_ACEOF |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
if \$ac_cs_recheck; then |
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
shift |
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
CONFIG_SHELL='$SHELL' |
@@ -8239,6 +8477,7 @@ do |
"test/perf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/Makefile" ;; |
"test/perf/collationperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/collationperf/Makefile" ;; |
"test/perf/collperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/collperf/Makefile" ;; |
+ "test/perf/collperf2/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/collperf2/Makefile" ;; |
"test/perf/dicttrieperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/dicttrieperf/Makefile" ;; |
"test/perf/ubrkperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/ubrkperf/Makefile" ;; |
"test/perf/charperf/Makefile") CONFIG_FILES="$CONFIG_FILES test/perf/charperf/Makefile" ;; |