1 |
Index: source/configure |
2 |
=================================================================== |
3 |
--- source/configure (revision 32754) |
4 |
+++ source/configure (working copy) |
5 |
@@ -1,13 +1,11 @@ |
6 |
#! /bin/sh |
7 |
# Guess values for system-dependent variables and create Makefiles. |
8 |
-# Generated by GNU Autoconf 2.68. |
9 |
+# Generated by GNU Autoconf 2.69. |
10 |
# |
11 |
# Copyright (c) 1999-2012, International Business Machines Corporation and others. All Rights Reserved. |
12 |
# |
13 |
# |
14 |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
15 |
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
16 |
-# Foundation, Inc. |
17 |
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
18 |
# |
19 |
# |
20 |
# This configure script is free software; the Free Software Foundation |
21 |
@@ -136,6 +134,31 @@ |
22 |
# CDPATH. |
23 |
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
24 |
|
25 |
+# Use a proper internal environment variable to ensure we don't fall |
26 |
+ # into an infinite loop, continuously re-executing ourselves. |
27 |
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
28 |
+ _as_can_reexec=no; export _as_can_reexec; |
29 |
+ # We cannot yet assume a decent shell, so we have to provide a |
30 |
+# neutralization value for shells without unset; and this also |
31 |
+# works around shells that cannot unset nonexistent variables. |
32 |
+# Preserve -v and -x to the replacement shell. |
33 |
+BASH_ENV=/dev/null |
34 |
+ENV=/dev/null |
35 |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
36 |
+case $- in # (((( |
37 |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
38 |
+ *v* ) as_opts=-v ;; |
39 |
+ *x* ) as_opts=-x ;; |
40 |
+ * ) as_opts= ;; |
41 |
+esac |
42 |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
43 |
+# Admittedly, this is quite paranoid, since all the known shells bail |
44 |
+# out after a failed `exec'. |
45 |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
46 |
+as_fn_exit 255 |
47 |
+ fi |
48 |
+ # We don't want this to propagate to other subprocesses. |
49 |
+ { _as_can_reexec=; unset _as_can_reexec;} |
50 |
if test "x$CONFIG_SHELL" = x; then |
51 |
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
52 |
emulate sh |
53 |
@@ -169,7 +192,8 @@ |
54 |
else |
55 |
exitcode=1; echo positional parameters were not saved. |
56 |
fi |
57 |
-test x\$exitcode = x0 || exit 1" |
58 |
+test x\$exitcode = x0 || exit 1 |
59 |
+test -x / || exit 1" |
60 |
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
61 |
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
62 |
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
63 |
@@ -214,21 +238,25 @@ |
64 |
|
65 |
|
66 |
if test "x$CONFIG_SHELL" != x; then : |
67 |
- # We cannot yet assume a decent shell, so we have to provide a |
68 |
- # neutralization value for shells without unset; and this also |
69 |
- # works around shells that cannot unset nonexistent variables. |
70 |
- # Preserve -v and -x to the replacement shell. |
71 |
- BASH_ENV=/dev/null |
72 |
- ENV=/dev/null |
73 |
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
74 |
- export CONFIG_SHELL |
75 |
- case $- in # (((( |
76 |
- *v*x* | *x*v* ) as_opts=-vx ;; |
77 |
- *v* ) as_opts=-v ;; |
78 |
- *x* ) as_opts=-x ;; |
79 |
- * ) as_opts= ;; |
80 |
- esac |
81 |
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
82 |
+ export CONFIG_SHELL |
83 |
+ # We cannot yet assume a decent shell, so we have to provide a |
84 |
+# neutralization value for shells without unset; and this also |
85 |
+# works around shells that cannot unset nonexistent variables. |
86 |
+# Preserve -v and -x to the replacement shell. |
87 |
+BASH_ENV=/dev/null |
88 |
+ENV=/dev/null |
89 |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
90 |
+case $- in # (((( |
91 |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
92 |
+ *v* ) as_opts=-v ;; |
93 |
+ *x* ) as_opts=-x ;; |
94 |
+ * ) as_opts= ;; |
95 |
+esac |
96 |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
97 |
+# Admittedly, this is quite paranoid, since all the known shells bail |
98 |
+# out after a failed `exec'. |
99 |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
100 |
+exit 255 |
101 |
fi |
102 |
|
103 |
if test x$as_have_required = xno; then : |
104 |
@@ -330,6 +358,14 @@ |
105 |
|
106 |
|
107 |
} # as_fn_mkdir_p |
108 |
+ |
109 |
+# as_fn_executable_p FILE |
110 |
+# ----------------------- |
111 |
+# Test if FILE is an executable regular file. |
112 |
+as_fn_executable_p () |
113 |
+{ |
114 |
+ test -f "$1" && test -x "$1" |
115 |
+} # as_fn_executable_p |
116 |
# as_fn_append VAR VALUE |
117 |
# ---------------------- |
118 |
# Append the text in VALUE to the end of the definition contained in VAR. Take |
119 |
@@ -451,6 +487,10 @@ |
120 |
chmod +x "$as_me.lineno" || |
121 |
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
122 |
|
123 |
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
124 |
+ # already done that, so ensure we don't try to do so again and fall |
125 |
+ # in an infinite loop. This has already happened in practice. |
126 |
+ _as_can_reexec=no; export _as_can_reexec |
127 |
# Don't try to exec as it changes $[0], causing all sort of problems |
128 |
# (the dirname of $[0] is not the place where we might find the |
129 |
# original and so on. Autoconf is especially sensitive to this). |
130 |
@@ -485,16 +525,16 @@ |
131 |
# ... but there are two gotchas: |
132 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
133 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
134 |
- # In both cases, we have to default to `cp -p'. |
135 |
+ # In both cases, we have to default to `cp -pR'. |
136 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
137 |
- as_ln_s='cp -p' |
138 |
+ as_ln_s='cp -pR' |
139 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
140 |
as_ln_s=ln |
141 |
else |
142 |
- as_ln_s='cp -p' |
143 |
+ as_ln_s='cp -pR' |
144 |
fi |
145 |
else |
146 |
- as_ln_s='cp -p' |
147 |
+ as_ln_s='cp -pR' |
148 |
fi |
149 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
150 |
rmdir conf$$.dir 2>/dev/null |
151 |
@@ -506,28 +546,8 @@ |
152 |
as_mkdir_p=false |
153 |
fi |
154 |
|
155 |
-if test -x / >/dev/null 2>&1; then |
156 |
- as_test_x='test -x' |
157 |
-else |
158 |
- if ls -dL / >/dev/null 2>&1; then |
159 |
- as_ls_L_option=L |
160 |
- else |
161 |
- as_ls_L_option= |
162 |
- fi |
163 |
- as_test_x=' |
164 |
- eval sh -c '\'' |
165 |
- if test -d "$1"; then |
166 |
- test -d "$1/."; |
167 |
- else |
168 |
- case $1 in #( |
169 |
- -*)set "./$1";; |
170 |
- esac; |
171 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
172 |
- ???[sx]*):;;*)false;;esac;fi |
173 |
- '\'' sh |
174 |
- ' |
175 |
-fi |
176 |
-as_executable_p=$as_test_x |
177 |
+as_test_x='test -x' |
178 |
+as_executable_p=as_fn_executable_p |
179 |
|
180 |
# Sed expression to map a string onto a valid CPP name. |
181 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
182 |
@@ -621,6 +641,7 @@ |
183 |
LAYOUT_TRUE |
184 |
ICUIO_TRUE |
185 |
EXTRAS_TRUE |
186 |
+ENABLE_CXX11 |
187 |
U_HAVE_WCSCPY |
188 |
U_HAVE_WCHAR_H |
189 |
U_TIMEZONE |
190 |
@@ -748,6 +769,7 @@ |
191 |
enable_dyload |
192 |
enable_rpath |
193 |
enable_weak_threads |
194 |
+enable_c__11 |
195 |
enable_extras |
196 |
enable_icuio |
197 |
enable_layout |
198 |
@@ -1223,8 +1245,6 @@ |
199 |
if test "x$host_alias" != x; then |
200 |
if test "x$build_alias" = x; then |
201 |
cross_compiling=maybe |
202 |
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
203 |
- If a cross compiler is detected then cross compile mode will be used" >&2 |
204 |
elif test "x$build_alias" != "x$host_alias"; then |
205 |
cross_compiling=yes |
206 |
fi |
207 |
@@ -1394,6 +1414,7 @@ |
208 |
--disable-dyload disable dynamic loading default=no |
209 |
--enable-rpath use rpath when linking default is only if necessary |
210 |
--enable-weak-threads weakly reference the threading library default=no |
211 |
+ --enable-c++11 attempt to use C++11 default=yes |
212 |
--enable-extras build ICU extras default=yes |
213 |
--enable-icuio build ICU's icuio library default=yes |
214 |
--enable-layout build ICU's layout library default=yes |
215 |
@@ -1490,9 +1511,9 @@ |
216 |
if $ac_init_version; then |
217 |
cat <<\_ACEOF |
218 |
configure |
219 |
-generated by GNU Autoconf 2.68 |
220 |
+generated by GNU Autoconf 2.69 |
221 |
|
222 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
223 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
224 |
This configure script is free software; the Free Software Foundation |
225 |
gives unlimited permission to copy, distribute and modify it. |
226 |
|
227 |
@@ -1645,7 +1666,7 @@ |
228 |
test ! -s conftest.err |
229 |
} && test -s conftest$ac_exeext && { |
230 |
test "$cross_compiling" = yes || |
231 |
- $as_test_x conftest$ac_exeext |
232 |
+ test -x conftest$ac_exeext |
233 |
}; then : |
234 |
ac_retval=0 |
235 |
else |
236 |
@@ -1723,7 +1744,8 @@ |
237 |
main () |
238 |
{ |
239 |
static int test_array [1 - 2 * !(($2) >= 0)]; |
240 |
-test_array [0] = 0 |
241 |
+test_array [0] = 0; |
242 |
+return test_array [0]; |
243 |
|
244 |
; |
245 |
return 0; |
246 |
@@ -1739,7 +1761,8 @@ |
247 |
main () |
248 |
{ |
249 |
static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
250 |
-test_array [0] = 0 |
251 |
+test_array [0] = 0; |
252 |
+return test_array [0]; |
253 |
|
254 |
; |
255 |
return 0; |
256 |
@@ -1765,7 +1788,8 @@ |
257 |
main () |
258 |
{ |
259 |
static int test_array [1 - 2 * !(($2) < 0)]; |
260 |
-test_array [0] = 0 |
261 |
+test_array [0] = 0; |
262 |
+return test_array [0]; |
263 |
|
264 |
; |
265 |
return 0; |
266 |
@@ -1781,7 +1805,8 @@ |
267 |
main () |
268 |
{ |
269 |
static int test_array [1 - 2 * !(($2) >= $ac_mid)]; |
270 |
-test_array [0] = 0 |
271 |
+test_array [0] = 0; |
272 |
+return test_array [0]; |
273 |
|
274 |
; |
275 |
return 0; |
276 |
@@ -1815,7 +1840,8 @@ |
277 |
main () |
278 |
{ |
279 |
static int test_array [1 - 2 * !(($2) <= $ac_mid)]; |
280 |
-test_array [0] = 0 |
281 |
+test_array [0] = 0; |
282 |
+return test_array [0]; |
283 |
|
284 |
; |
285 |
return 0; |
286 |
@@ -1942,7 +1968,7 @@ |
287 |
test ! -s conftest.err |
288 |
} && test -s conftest$ac_exeext && { |
289 |
test "$cross_compiling" = yes || |
290 |
- $as_test_x conftest$ac_exeext |
291 |
+ test -x conftest$ac_exeext |
292 |
}; then : |
293 |
ac_retval=0 |
294 |
else |
295 |
@@ -2173,7 +2199,7 @@ |
296 |
running configure, to aid debugging if configure makes a mistake. |
297 |
|
298 |
It was created by $as_me, which was |
299 |
-generated by GNU Autoconf 2.68. Invocation command line was |
300 |
+generated by GNU Autoconf 2.69. Invocation command line was |
301 |
|
302 |
$ $0 $@ |
303 |
|
304 |
@@ -2764,7 +2790,7 @@ |
305 |
IFS=$as_save_IFS |
306 |
test -z "$as_dir" && as_dir=. |
307 |
for ac_exec_ext in '' $ac_executable_extensions; do |
308 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
309 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
310 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
311 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
312 |
break 2 |
313 |
@@ -2808,7 +2834,7 @@ |
314 |
IFS=$as_save_IFS |
315 |
test -z "$as_dir" && as_dir=. |
316 |
for ac_exec_ext in '' $ac_executable_extensions; do |
317 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
318 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
319 |
ac_cv_prog_ac_ct_CC="$ac_prog" |
320 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
321 |
break 2 |
322 |
@@ -3252,8 +3278,7 @@ |
323 |
/* end confdefs.h. */ |
324 |
#include <stdarg.h> |
325 |
#include <stdio.h> |
326 |
-#include <sys/types.h> |
327 |
-#include <sys/stat.h> |
328 |
+struct stat; |
329 |
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
330 |
struct buf { int x; }; |
331 |
FILE * (*rcsopen) (struct buf *, struct stat *, int); |
332 |
@@ -3368,7 +3393,7 @@ |
333 |
IFS=$as_save_IFS |
334 |
test -z "$as_dir" && as_dir=. |
335 |
for ac_exec_ext in '' $ac_executable_extensions; do |
336 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
337 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
338 |
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
339 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
340 |
break 2 |
341 |
@@ -3412,7 +3437,7 @@ |
342 |
IFS=$as_save_IFS |
343 |
test -z "$as_dir" && as_dir=. |
344 |
for ac_exec_ext in '' $ac_executable_extensions; do |
345 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
346 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
347 |
ac_cv_prog_ac_ct_CXX="$ac_prog" |
348 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
349 |
break 2 |
350 |
@@ -3794,7 +3819,7 @@ |
351 |
# by default. |
352 |
for ac_prog in ginstall scoinst install; do |
353 |
for ac_exec_ext in '' $ac_executable_extensions; do |
354 |
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
355 |
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
356 |
if test $ac_prog = install && |
357 |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
358 |
# AIX install. It has an incompatible calling convention. |
359 |
@@ -3915,7 +3940,7 @@ |
360 |
IFS=$as_save_IFS |
361 |
test -z "$as_dir" && as_dir=. |
362 |
for ac_exec_ext in '' $ac_executable_extensions; do |
363 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
364 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
365 |
ac_cv_path_U_MAKE="$as_dir/$ac_word$ac_exec_ext" |
366 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
367 |
break 2 |
368 |
@@ -3991,7 +4016,7 @@ |
369 |
IFS=$as_save_IFS |
370 |
test -z "$as_dir" && as_dir=. |
371 |
for ac_exec_ext in '' $ac_executable_extensions; do |
372 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
373 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
374 |
ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" |
375 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
376 |
break 2 |
377 |
@@ -4110,7 +4135,7 @@ |
378 |
for ac_prog in grep ggrep; do |
379 |
for ac_exec_ext in '' $ac_executable_extensions; do |
380 |
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
381 |
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
382 |
+ as_fn_executable_p "$ac_path_GREP" || continue |
383 |
# Check for GNU ac_path_GREP and select it if it is found. |
384 |
# Check for GNU $ac_path_GREP |
385 |
case `"$ac_path_GREP" --version 2>&1` in |
386 |
@@ -4176,7 +4201,7 @@ |
387 |
for ac_prog in egrep; do |
388 |
for ac_exec_ext in '' $ac_executable_extensions; do |
389 |
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
390 |
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
391 |
+ as_fn_executable_p "$ac_path_EGREP" || continue |
392 |
# Check for GNU ac_path_EGREP and select it if it is found. |
393 |
# Check for GNU $ac_path_EGREP |
394 |
case `"$ac_path_EGREP" --version 2>&1` in |
395 |
@@ -5181,7 +5206,7 @@ |
396 |
IFS=$as_save_IFS |
397 |
test -z "$as_dir" && as_dir=. |
398 |
for ac_exec_ext in '' $ac_executable_extensions; do |
399 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
400 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
401 |
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
402 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
403 |
break 2 |
404 |
@@ -5221,7 +5246,7 @@ |
405 |
IFS=$as_save_IFS |
406 |
test -z "$as_dir" && as_dir=. |
407 |
for ac_exec_ext in '' $ac_executable_extensions; do |
408 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
409 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
410 |
ac_cv_prog_ac_ct_RANLIB="ranlib" |
411 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
412 |
break 2 |
413 |
@@ -5275,7 +5300,7 @@ |
414 |
IFS=$as_save_IFS |
415 |
test -z "$as_dir" && as_dir=. |
416 |
for ac_exec_ext in '' $ac_executable_extensions; do |
417 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
418 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
419 |
ac_cv_prog_AR="${ac_tool_prefix}ar" |
420 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
421 |
break 2 |
422 |
@@ -5315,7 +5340,7 @@ |
423 |
IFS=$as_save_IFS |
424 |
test -z "$as_dir" && as_dir=. |
425 |
for ac_exec_ext in '' $ac_executable_extensions; do |
426 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
427 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
428 |
ac_cv_prog_ac_ct_AR="ar" |
429 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
430 |
break 2 |
431 |
@@ -6882,6 +6907,25 @@ |
432 |
fi |
433 |
fi |
434 |
|
435 |
+# Check whether to build static libraries |
436 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use C++11" >&5 |
437 |
+$as_echo_n "checking whether to use C++11... " >&6; } |
438 |
+enabled=yes |
439 |
+ENABLE_CXX11=YES |
440 |
+# Check whether --enable-c++11 was given. |
441 |
+if test "${enable_c__11+set}" = set; then : |
442 |
+ enableval=$enable_c__11; case "${enableval}" in |
443 |
+ yes|"") enabled=yes; ENABLE_CXX11=YES ;; |
444 |
+ no) enabled=no; ENABLE_CXX11=NO;; |
445 |
+ *) ;; |
446 |
+ esac |
447 |
+fi |
448 |
+ |
449 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enabled" >&5 |
450 |
+$as_echo "$enabled" >&6; } |
451 |
+ |
452 |
+ |
453 |
+ |
454 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UTF-16 string literal support" >&5 |
455 |
$as_echo_n "checking for UTF-16 string literal support... " >&6; } |
456 |
U_CHECK_UTF16_STRING=1 |
457 |
@@ -7005,7 +7049,9 @@ |
458 |
if test "$GXX" = yes; then |
459 |
OLD_CXXFLAGS="${CXXFLAGS}" |
460 |
# -Wno-return-type-c-linkage is desired so that stable ICU API is not warned about. |
461 |
- CXXFLAGS="${CXXFLAGS} -std=c++11" |
462 |
+ if test "$ENABLE_CXX11" = YES; then |
463 |
+ CXXFLAGS="${CXXFLAGS} -std=c++11" |
464 |
+ fi |
465 |
ac_ext=cpp |
466 |
ac_cpp='$CXXCPP $CPPFLAGS' |
467 |
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
468 |
@@ -7752,16 +7798,16 @@ |
469 |
# ... but there are two gotchas: |
470 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
471 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
472 |
- # In both cases, we have to default to `cp -p'. |
473 |
+ # In both cases, we have to default to `cp -pR'. |
474 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
475 |
- as_ln_s='cp -p' |
476 |
+ as_ln_s='cp -pR' |
477 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
478 |
as_ln_s=ln |
479 |
else |
480 |
- as_ln_s='cp -p' |
481 |
+ as_ln_s='cp -pR' |
482 |
fi |
483 |
else |
484 |
- as_ln_s='cp -p' |
485 |
+ as_ln_s='cp -pR' |
486 |
fi |
487 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
488 |
rmdir conf$$.dir 2>/dev/null |
489 |
@@ -7821,29 +7867,17 @@ |
490 |
as_mkdir_p=false |
491 |
fi |
492 |
|
493 |
-if test -x / >/dev/null 2>&1; then |
494 |
- as_test_x='test -x' |
495 |
-else |
496 |
- if ls -dL / >/dev/null 2>&1; then |
497 |
- as_ls_L_option=L |
498 |
- else |
499 |
- as_ls_L_option= |
500 |
- fi |
501 |
- as_test_x=' |
502 |
- eval sh -c '\'' |
503 |
- if test -d "$1"; then |
504 |
- test -d "$1/."; |
505 |
- else |
506 |
- case $1 in #( |
507 |
- -*)set "./$1";; |
508 |
- esac; |
509 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
510 |
- ???[sx]*):;;*)false;;esac;fi |
511 |
- '\'' sh |
512 |
- ' |
513 |
-fi |
514 |
-as_executable_p=$as_test_x |
515 |
|
516 |
+# as_fn_executable_p FILE |
517 |
+# ----------------------- |
518 |
+# Test if FILE is an executable regular file. |
519 |
+as_fn_executable_p () |
520 |
+{ |
521 |
+ test -f "$1" && test -x "$1" |
522 |
+} # as_fn_executable_p |
523 |
+as_test_x='test -x' |
524 |
+as_executable_p=as_fn_executable_p |
525 |
+ |
526 |
# Sed expression to map a string onto a valid CPP name. |
527 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
528 |
|
529 |
@@ -7864,7 +7898,7 @@ |
530 |
# values after options handling. |
531 |
ac_log=" |
532 |
This file was extended by $as_me, which was |
533 |
-generated by GNU Autoconf 2.68. Invocation command line was |
534 |
+generated by GNU Autoconf 2.69. Invocation command line was |
535 |
|
536 |
CONFIG_FILES = $CONFIG_FILES |
537 |
CONFIG_HEADERS = $CONFIG_HEADERS |
538 |
@@ -7917,10 +7951,10 @@ |
539 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
540 |
ac_cs_version="\\ |
541 |
config.status |
542 |
-configured by $0, generated by GNU Autoconf 2.68, |
543 |
+configured by $0, generated by GNU Autoconf 2.69, |
544 |
with options \\"\$ac_cs_config\\" |
545 |
|
546 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
547 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
548 |
This config.status script is free software; the Free Software Foundation |
549 |
gives unlimited permission to copy, distribute and modify it." |
550 |
|
551 |
@@ -7998,7 +8032,7 @@ |
552 |
_ACEOF |
553 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
554 |
if \$ac_cs_recheck; then |
555 |
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
556 |
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
557 |
shift |
558 |
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
559 |
CONFIG_SHELL='$SHELL' |
560 |
Index: source/configure.in |
561 |
=================================================================== |
562 |
--- source/configure.in (revision 32754) |
563 |
+++ source/configure.in (working copy) |
564 |
@@ -4,7 +4,7 @@ |
565 |
# Stephen F. Booth, heavily modified by Yves and others |
566 |
|
567 |
# Check for autoconf version |
568 |
-AC_PREREQ(2.68) |
569 |
+AC_PREREQ(2.69) |
570 |
|
571 |
# Process this file with autoconf to produce a configure script |
572 |
AC_INIT([ICU]) |
573 |
@@ -898,6 +898,22 @@ |
574 |
fi |
575 |
fi |
576 |
|
577 |
+# Check whether to build static libraries |
578 |
+AC_MSG_CHECKING([whether to use C++11]) |
579 |
+enabled=yes |
580 |
+ENABLE_CXX11=YES |
581 |
+AC_ARG_ENABLE(c++11, |
582 |
+ [ --enable-c++11 attempt to use C++11 [default=yes]], |
583 |
+ [ case "${enableval}" in |
584 |
+ yes|"") enabled=yes; ENABLE_CXX11=YES ;; |
585 |
+ no) enabled=no; ENABLE_CXX11=NO;; |
586 |
+ *) ;; |
587 |
+ esac], |
588 |
+) |
589 |
+AC_MSG_RESULT($enabled) |
590 |
+AC_SUBST(ENABLE_CXX11) |
591 |
+ |
592 |
+ |
593 |
AC_MSG_CHECKING([for UTF-16 string literal support]) |
594 |
U_CHECK_UTF16_STRING=1 |
595 |
CHECK_UTF16_STRING_RESULT="unknown" |
596 |
@@ -972,7 +988,9 @@ |
597 |
if test "$GXX" = yes; then |
598 |
OLD_CXXFLAGS="${CXXFLAGS}" |
599 |
# -Wno-return-type-c-linkage is desired so that stable ICU API is not warned about. |
600 |
- CXXFLAGS="${CXXFLAGS} -std=c++11" |
601 |
+ if test "$ENABLE_CXX11" = YES; then |
602 |
+ CXXFLAGS="${CXXFLAGS} -std=c++11" |
603 |
+ fi |
604 |
AC_LANG_PUSH([C++]) |
605 |
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
606 |
static const char16_t test[] = u"This is a UTF16 literal string."; |
607 |
Index: source/icudefs.mk.in |
608 |
=================================================================== |
609 |
--- source/icudefs.mk.in (revision 32754) |
610 |
+++ source/icudefs.mk.in (working copy) |
611 |
@@ -108,6 +108,7 @@ |
612 |
|
613 |
ENABLE_DEBUG = @ENABLE_DEBUG@ |
614 |
ENABLE_RELEASE = @ENABLE_RELEASE@ |
615 |
+ENABLE_CXX11 = @ENABLE_CXX11@ |
616 |
EXEEXT = @EXEEXT@ |
617 |
CC = @CC@ |
618 |
CXX = @CXX@ |