Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 05 Sep 2013 10:58:25 -0700
- author
- kvn
- date
- Thu, 05 Sep 2013 10:58:25 -0700
- changeset 970
- e885c762cedd
- parent 969
- f29be0099f41
- parent 787
- 58f1b6f32b47
- child 971
- 584dc2e95e04
Merge
1.1 --- a/.hgtags Fri Aug 16 16:22:23 2013 -0700 1.2 +++ b/.hgtags Thu Sep 05 10:58:25 2013 -0700 1.3 @@ -225,3 +225,6 @@ 1.4 9f74a220677dc265a724515d8e2617548cef62f1 jdk8-b101 1.5 5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102 1.6 b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103 1.7 +96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104 1.8 +5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105 1.9 +8e7b4d9fb00fdf1334376aeac050c9bca6d1b383 jdk8-b106
2.1 --- a/NewMakefile.gmk Fri Aug 16 16:22:23 2013 -0700 2.2 +++ b/NewMakefile.gmk Thu Sep 05 10:58:25 2013 -0700 2.3 @@ -69,11 +69,11 @@ 2.4 # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find 2.5 # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 2.6 all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ 2.7 - $(MAKE) -p -q -f common/makefiles/Main.gmk SPEC=$(firstword $(SPEC)) | \ 2.8 + $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ 2.9 grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 2.10 2.11 $(all_phony_targets): 2.12 - $(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ 2.13 + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ 2.14 $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true 2.15 2.16 .PHONY: $(all_phony_targets) 2.17 @@ -98,6 +98,7 @@ 2.18 $(info . # corba and jdk) 2.19 $(info . make all # Compile everything, all repos and images) 2.20 $(info . make images # Create complete j2sdk and j2re images) 2.21 + $(info . make docs # Create javadocs) 2.22 $(info . make overlay-images # Create limited images for sparc 64 bit platforms) 2.23 $(info . make profiles # Create complete j2re compact profile images) 2.24 $(info . make bootcycle-images # Build images twice, second time with newly build JDK) 2.25 @@ -109,7 +110,7 @@ 2.26 $(info . make test # Run tests, default is all tests (see TEST below)) 2.27 $(info ) 2.28 $(info Targets for specific components) 2.29 - $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) 2.30 + $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test)) 2.31 $(info . make <component> # Build <component> and everything it depends on. ) 2.32 $(info . make <component>-only # Build <component> only, without dependencies. This) 2.33 $(info . # is faster but can result in incorrect build results!)
3.1 --- a/README-builds.html Fri Aug 16 16:22:23 2013 -0700 3.2 +++ b/README-builds.html Thu Sep 05 10:58:25 2013 -0700 3.3 @@ -154,7 +154,7 @@ 3.4 </code> 3.5 </blockquote> 3.6 Once you have all the repositories, keep in mind that each 3.7 - repository is it's own independent repository. 3.8 + repository is its own independent repository. 3.9 You can also re-run <code>./get_source.sh</code> anytime to 3.10 pull over all the latest changesets in all the repositories. 3.11 This set of nested repositories has been given the term 3.12 @@ -241,6 +241,14 @@ 3.13 source code for the OpenJDK Corba functionality 3.14 </td> 3.15 </tr> 3.16 + <tr> 3.17 + <td> 3.18 + nashorn 3.19 + </td> 3.20 + <td> 3.21 + source code for the OpenJDK JavaScript implementation 3.22 + </td> 3.23 + </tr> 3.24 </tbody> 3.25 </table> 3.26 </blockquote> 3.27 @@ -386,7 +394,7 @@ 3.28 <code>--with-boot-jdk</code>. 3.29 </li> 3.30 <li> 3.31 - Insure that GNU make, the Bootstrap JDK, 3.32 + Ensure that GNU make, the Bootstrap JDK, 3.33 and the compilers are all 3.34 in your PATH environment variable 3.35 </li> 3.36 @@ -1202,19 +1210,18 @@ 3.37 <blockquote> 3.38 3.39 <p> 3.40 - <b>Q:</b> The <code>configure</code> file looks horrible! 3.41 + <b>Q:</b> The <code>generated-configure.sh</code> file looks horrible! 3.42 How are you going to edit it? 3.43 <br> 3.44 - <b>A:</b> The <code>configure</code> file is generated (think 3.45 + <b>A:</b> The <code>generated-configure.sh</code> file is generated (think 3.46 "compiled") by the autoconf tools. The source code is 3.47 - in <code>configure.ac</code> various .m4 files in common/autoconf, 3.48 - which are 3.49 - much more readable. 3.50 + in <code>configure.ac</code> and various .m4 files in common/autoconf, 3.51 + which are much more readable. 3.52 </p> 3.53 3.54 <p> 3.55 <b>Q:</b> 3.56 - Why is the <code>configure</code> file checked in, 3.57 + Why is the <code>generated-configure.sh</code> file checked in, 3.58 if it is generated? 3.59 <br> 3.60 <b>A:</b> 3.61 @@ -1229,13 +1236,29 @@ 3.62 <p> 3.63 <b>Q:</b> 3.64 Do you require a specific version of autoconf for regenerating 3.65 - <code>configure</code>? 3.66 + <code>generated-configure.sh</code>? 3.67 <br> 3.68 <b>A:</b> 3.69 - Currently, no, but this will likely be the case when things have 3.70 - settled down a bit more. (The reason for this is to avoid 3.71 - large spurious changes in <code>configure</code> 3.72 - in commits that made small changes to <code>configure.ac</code>). 3.73 + Yes, version 2.69 is required and should be easy 3.74 + enough to aquire on all supported operating 3.75 + systems. The reason for this is to avoid 3.76 + large spurious changes in <code>generated-configure.sh</code>. 3.77 + </p> 3.78 + 3.79 + <p> 3.80 + <b>Q:</b> 3.81 + How do you regenerate <code>generated-configure.sh</code> 3.82 + after making changes to the input files? 3.83 + <br> 3.84 + <b>A:</b> 3.85 + Regnerating <code>generated-configure.sh</code> 3.86 + should always be done using the 3.87 + script <code>common/autoconf/autogen.sh</code> to 3.88 + ensure that the correct files get updated. This 3.89 + script should also be run after mercurial tries to 3.90 + merge <code>generated-configure.sh</code> as a 3.91 + merge of the generated file is not guaranteed to 3.92 + be correct. 3.93 </p> 3.94 3.95 <p> 3.96 @@ -1307,9 +1330,9 @@ 3.97 you will need to modify the makefiles. But for normal file 3.98 additions or removals, no changes are needed. There are certan 3.99 exceptions for some native libraries where the source files are spread 3.100 - over many directories which also contain courses for other 3.101 + over many directories which also contain sources for other 3.102 libraries. In these cases it was simply easier to create include lists 3.103 - rather thane excludes. 3.104 + rather than excludes. 3.105 </p> 3.106 3.107 <p> 3.108 @@ -1327,14 +1350,14 @@ 3.109 <p> 3.110 <b>Q:</b> 3.111 <code>configure</code> provides OpenJDK-specific features such as 3.112 - <code>--enable-jigsaw</code> or <code>--with-builddeps-server</code> 3.113 - that are not described in this document. What about those? 3.114 + <code>--with-builddeps-server</code> that are not 3.115 + described in this document. What about those? 3.116 <br> 3.117 <b>A:</b> 3.118 Try them out if you like! But be aware that most of these are 3.119 experimental features. 3.120 Many of them don't do anything at all at the moment; the option 3.121 - is just a placeholder. Other depends on 3.122 + is just a placeholder. Others depend on 3.123 pieces of code or infrastructure that is currently 3.124 not ready for prime time. 3.125 </p> 3.126 @@ -1386,24 +1409,6 @@ 3.127 </p> 3.128 3.129 <p> 3.130 - <b>Q:</b> What is @GenerateNativeHeaders? 3.131 - <br> 3.132 - <b>A:</b> 3.133 - To speed up compilation, we added a flag to javac which makes it 3.134 - do the job of javah as well, as a by-product; that is, generating 3.135 - native .h header files. These files are only generated 3.136 - if a class contains native methods. However, sometimes 3.137 - a class contains no native method, 3.138 - but still contains constants that native code needs to use. 3.139 - The new GenerateNativeHeaders annotation tells javac to 3.140 - force generation of a 3.141 - header file in these cases. (We don't want to generate 3.142 - native headers for all classes that contains constants 3.143 - but no native methods, since 3.144 - that would slow down the compilation process needlessly.) 3.145 - </p> 3.146 - 3.147 - <p> 3.148 <b>Q:</b> 3.149 Is anything able to use the results of the new build's default make target? 3.150 <br> 3.151 @@ -1429,10 +1434,9 @@ 3.152 What should I do? 3.153 <br> 3.154 <b>A:</b> 3.155 - It might very well be that we have missed to add support for 3.156 + It might very well be that we have neglected to add support for 3.157 an option that was actually used from outside the build system. 3.158 - Email us and we will 3.159 - add support for it! 3.160 + Email us and we will add support for it! 3.161 </p> 3.162 3.163 </blockquote>
4.1 --- a/common/autoconf/autogen.sh Fri Aug 16 16:22:23 2013 -0700 4.2 +++ b/common/autoconf/autogen.sh Thu Sep 05 10:58:25 2013 -0700 4.3 @@ -44,10 +44,8 @@ 4.4 custom_hook=$custom_script_dir/custom-hook.m4 4.5 4.6 AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" 4.7 -AUTOCONF_267="`which autoconf-2.67 2> /dev/null | grep -v '^no autoconf-2.67 in'`" 4.8 4.9 echo "Autoconf found: ${AUTOCONF}" 4.10 -echo "Autoconf-2.67 found: ${AUTOCONF_267}" 4.11 4.12 if test "x${AUTOCONF}" = x; then 4.13 echo You need autoconf installed to be able to regenerate the configure script 4.14 @@ -55,10 +53,6 @@ 4.15 exit 1 4.16 fi 4.17 4.18 -if test "x${AUTOCONF_267}" != x; then 4.19 - AUTOCONF=${AUTOCONF_267}; 4.20 -fi 4.21 - 4.22 echo Generating generated-configure.sh with ${AUTOCONF} 4.23 cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh 4.24 rm -rf autom4te.cache
5.1 --- a/common/autoconf/configure.ac Fri Aug 16 16:22:23 2013 -0700 5.2 +++ b/common/autoconf/configure.ac Thu Sep 05 10:58:25 2013 -0700 5.3 @@ -30,7 +30,7 @@ 5.4 ############################################################################### 5.5 5.6 5.7 -AC_PREREQ([2.61]) 5.8 +AC_PREREQ([2.69]) 5.9 AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net) 5.10 5.11 AC_CONFIG_AUX_DIR([build-aux])
6.1 --- a/common/autoconf/generated-configure.sh Fri Aug 16 16:22:23 2013 -0700 6.2 +++ b/common/autoconf/generated-configure.sh Thu Sep 05 10:58:25 2013 -0700 6.3 @@ -1,13 +1,11 @@ 6.4 #! /bin/sh 6.5 # Guess values for system-dependent variables and create Makefiles. 6.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 6.7 +# Generated by GNU Autoconf 2.69 for OpenJDK jdk8. 6.8 # 6.9 # Report bugs to <build-dev@openjdk.java.net>. 6.10 # 6.11 # 6.12 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 6.13 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 6.14 -# Foundation, Inc. 6.15 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 6.16 # 6.17 # 6.18 # This configure script is free software; the Free Software Foundation 6.19 @@ -91,6 +89,7 @@ 6.20 IFS=" "" $as_nl" 6.21 6.22 # Find who we are. Look in the path if we contain no directory separator. 6.23 +as_myself= 6.24 case $0 in #(( 6.25 *[\\/]* ) as_myself=$0 ;; 6.26 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6.27 @@ -135,6 +134,31 @@ 6.28 # CDPATH. 6.29 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 6.30 6.31 +# Use a proper internal environment variable to ensure we don't fall 6.32 + # into an infinite loop, continuously re-executing ourselves. 6.33 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then 6.34 + _as_can_reexec=no; export _as_can_reexec; 6.35 + # We cannot yet assume a decent shell, so we have to provide a 6.36 +# neutralization value for shells without unset; and this also 6.37 +# works around shells that cannot unset nonexistent variables. 6.38 +# Preserve -v and -x to the replacement shell. 6.39 +BASH_ENV=/dev/null 6.40 +ENV=/dev/null 6.41 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 6.42 +case $- in # (((( 6.43 + *v*x* | *x*v* ) as_opts=-vx ;; 6.44 + *v* ) as_opts=-v ;; 6.45 + *x* ) as_opts=-x ;; 6.46 + * ) as_opts= ;; 6.47 +esac 6.48 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 6.49 +# Admittedly, this is quite paranoid, since all the known shells bail 6.50 +# out after a failed `exec'. 6.51 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 6.52 +as_fn_exit 255 6.53 + fi 6.54 + # We don't want this to propagate to other subprocesses. 6.55 + { _as_can_reexec=; unset _as_can_reexec;} 6.56 if test "x$CONFIG_SHELL" = x; then 6.57 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 6.58 emulate sh 6.59 @@ -168,7 +192,8 @@ 6.60 else 6.61 exitcode=1; echo positional parameters were not saved. 6.62 fi 6.63 -test x\$exitcode = x0 || exit 1" 6.64 +test x\$exitcode = x0 || exit 1 6.65 +test -x / || exit 1" 6.66 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 6.67 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 6.68 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && 6.69 @@ -213,14 +238,25 @@ 6.70 6.71 6.72 if test "x$CONFIG_SHELL" != x; then : 6.73 - # We cannot yet assume a decent shell, so we have to provide a 6.74 - # neutralization value for shells without unset; and this also 6.75 - # works around shells that cannot unset nonexistent variables. 6.76 - BASH_ENV=/dev/null 6.77 - ENV=/dev/null 6.78 - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 6.79 - export CONFIG_SHELL 6.80 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 6.81 + export CONFIG_SHELL 6.82 + # We cannot yet assume a decent shell, so we have to provide a 6.83 +# neutralization value for shells without unset; and this also 6.84 +# works around shells that cannot unset nonexistent variables. 6.85 +# Preserve -v and -x to the replacement shell. 6.86 +BASH_ENV=/dev/null 6.87 +ENV=/dev/null 6.88 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 6.89 +case $- in # (((( 6.90 + *v*x* | *x*v* ) as_opts=-vx ;; 6.91 + *v* ) as_opts=-v ;; 6.92 + *x* ) as_opts=-x ;; 6.93 + * ) as_opts= ;; 6.94 +esac 6.95 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 6.96 +# Admittedly, this is quite paranoid, since all the known shells bail 6.97 +# out after a failed `exec'. 6.98 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 6.99 +exit 255 6.100 fi 6.101 6.102 if test x$as_have_required = xno; then : 6.103 @@ -323,6 +359,14 @@ 6.104 6.105 6.106 } # as_fn_mkdir_p 6.107 + 6.108 +# as_fn_executable_p FILE 6.109 +# ----------------------- 6.110 +# Test if FILE is an executable regular file. 6.111 +as_fn_executable_p () 6.112 +{ 6.113 + test -f "$1" && test -x "$1" 6.114 +} # as_fn_executable_p 6.115 # as_fn_append VAR VALUE 6.116 # ---------------------- 6.117 # Append the text in VALUE to the end of the definition contained in VAR. Take 6.118 @@ -444,6 +488,10 @@ 6.119 chmod +x "$as_me.lineno" || 6.120 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 6.121 6.122 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have 6.123 + # already done that, so ensure we don't try to do so again and fall 6.124 + # in an infinite loop. This has already happened in practice. 6.125 + _as_can_reexec=no; export _as_can_reexec 6.126 # Don't try to exec as it changes $[0], causing all sort of problems 6.127 # (the dirname of $[0] is not the place where we might find the 6.128 # original and so on. Autoconf is especially sensitive to this). 6.129 @@ -478,16 +526,16 @@ 6.130 # ... but there are two gotchas: 6.131 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 6.132 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 6.133 - # In both cases, we have to default to `cp -p'. 6.134 + # In both cases, we have to default to `cp -pR'. 6.135 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 6.136 - as_ln_s='cp -p' 6.137 + as_ln_s='cp -pR' 6.138 elif ln conf$$.file conf$$ 2>/dev/null; then 6.139 as_ln_s=ln 6.140 else 6.141 - as_ln_s='cp -p' 6.142 - fi 6.143 -else 6.144 - as_ln_s='cp -p' 6.145 + as_ln_s='cp -pR' 6.146 + fi 6.147 +else 6.148 + as_ln_s='cp -pR' 6.149 fi 6.150 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 6.151 rmdir conf$$.dir 2>/dev/null 6.152 @@ -499,28 +547,8 @@ 6.153 as_mkdir_p=false 6.154 fi 6.155 6.156 -if test -x / >/dev/null 2>&1; then 6.157 - as_test_x='test -x' 6.158 -else 6.159 - if ls -dL / >/dev/null 2>&1; then 6.160 - as_ls_L_option=L 6.161 - else 6.162 - as_ls_L_option= 6.163 - fi 6.164 - as_test_x=' 6.165 - eval sh -c '\'' 6.166 - if test -d "$1"; then 6.167 - test -d "$1/."; 6.168 - else 6.169 - case $1 in #( 6.170 - -*)set "./$1";; 6.171 - esac; 6.172 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 6.173 - ???[sx]*):;;*)false;;esac;fi 6.174 - '\'' sh 6.175 - ' 6.176 -fi 6.177 -as_executable_p=$as_test_x 6.178 +as_test_x='test -x' 6.179 +as_executable_p=as_fn_executable_p 6.180 6.181 # Sed expression to map a string onto a valid CPP name. 6.182 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 6.183 @@ -682,6 +710,7 @@ 6.184 SHARED_LIBRARY 6.185 OBJ_SUFFIX 6.186 COMPILER_NAME 6.187 +TARGET_BITS_FLAG 6.188 JT_HOME 6.189 JTREGEXE 6.190 LIPO 6.191 @@ -1465,7 +1494,7 @@ 6.192 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 6.193 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 6.194 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 6.195 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 6.196 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 6.197 ;; 6.198 6.199 esac 6.200 @@ -1516,8 +1545,6 @@ 6.201 if test "x$host_alias" != x; then 6.202 if test "x$build_alias" = x; then 6.203 cross_compiling=maybe 6.204 - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 6.205 - If a cross compiler is detected then cross compile mode will be used" >&2 6.206 elif test "x$build_alias" != "x$host_alias"; then 6.207 cross_compiling=yes 6.208 fi 6.209 @@ -1903,9 +1930,9 @@ 6.210 if $ac_init_version; then 6.211 cat <<\_ACEOF 6.212 OpenJDK configure jdk8 6.213 -generated by GNU Autoconf 2.67 6.214 - 6.215 -Copyright (C) 2010 Free Software Foundation, Inc. 6.216 +generated by GNU Autoconf 2.69 6.217 + 6.218 +Copyright (C) 2012 Free Software Foundation, Inc. 6.219 This configure script is free software; the Free Software Foundation 6.220 gives unlimited permission to copy, distribute and modify it. 6.221 _ACEOF 6.222 @@ -1949,7 +1976,7 @@ 6.223 6.224 ac_retval=1 6.225 fi 6.226 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.227 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.228 as_fn_set_status $ac_retval 6.229 6.230 } # ac_fn_c_try_compile 6.231 @@ -1987,7 +2014,7 @@ 6.232 6.233 ac_retval=1 6.234 fi 6.235 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.236 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.237 as_fn_set_status $ac_retval 6.238 6.239 } # ac_fn_cxx_try_compile 6.240 @@ -2025,7 +2052,7 @@ 6.241 6.242 ac_retval=1 6.243 fi 6.244 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.245 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.246 as_fn_set_status $ac_retval 6.247 6.248 } # ac_fn_objc_try_compile 6.249 @@ -2062,7 +2089,7 @@ 6.250 6.251 ac_retval=1 6.252 fi 6.253 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.254 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.255 as_fn_set_status $ac_retval 6.256 6.257 } # ac_fn_c_try_cpp 6.258 @@ -2099,7 +2126,7 @@ 6.259 6.260 ac_retval=1 6.261 fi 6.262 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.263 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.264 as_fn_set_status $ac_retval 6.265 6.266 } # ac_fn_cxx_try_cpp 6.267 @@ -2112,10 +2139,10 @@ 6.268 ac_fn_cxx_check_header_mongrel () 6.269 { 6.270 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6.271 - if eval "test \"\${$3+set}\"" = set; then : 6.272 + if eval \${$3+:} false; then : 6.273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 6.274 $as_echo_n "checking for $2... " >&6; } 6.275 -if eval "test \"\${$3+set}\"" = set; then : 6.276 +if eval \${$3+:} false; then : 6.277 $as_echo_n "(cached) " >&6 6.278 fi 6.279 eval ac_res=\$$3 6.280 @@ -2182,7 +2209,7 @@ 6.281 esac 6.282 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 6.283 $as_echo_n "checking for $2... " >&6; } 6.284 -if eval "test \"\${$3+set}\"" = set; then : 6.285 +if eval \${$3+:} false; then : 6.286 $as_echo_n "(cached) " >&6 6.287 else 6.288 eval "$3=\$ac_header_compiler" 6.289 @@ -2191,7 +2218,7 @@ 6.290 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 6.291 $as_echo "$ac_res" >&6; } 6.292 fi 6.293 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.294 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.295 6.296 } # ac_fn_cxx_check_header_mongrel 6.297 6.298 @@ -2232,7 +2259,7 @@ 6.299 ac_retval=$ac_status 6.300 fi 6.301 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 6.302 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.303 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.304 as_fn_set_status $ac_retval 6.305 6.306 } # ac_fn_cxx_try_run 6.307 @@ -2246,7 +2273,7 @@ 6.308 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6.309 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 6.310 $as_echo_n "checking for $2... " >&6; } 6.311 -if eval "test \"\${$3+set}\"" = set; then : 6.312 +if eval \${$3+:} false; then : 6.313 $as_echo_n "(cached) " >&6 6.314 else 6.315 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.316 @@ -2264,7 +2291,7 @@ 6.317 eval ac_res=\$$3 6.318 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 6.319 $as_echo "$ac_res" >&6; } 6.320 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.321 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.322 6.323 } # ac_fn_cxx_check_header_compile 6.324 6.325 @@ -2285,7 +2312,8 @@ 6.326 main () 6.327 { 6.328 static int test_array [1 - 2 * !(($2) >= 0)]; 6.329 -test_array [0] = 0 6.330 +test_array [0] = 0; 6.331 +return test_array [0]; 6.332 6.333 ; 6.334 return 0; 6.335 @@ -2301,7 +2329,8 @@ 6.336 main () 6.337 { 6.338 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; 6.339 -test_array [0] = 0 6.340 +test_array [0] = 0; 6.341 +return test_array [0]; 6.342 6.343 ; 6.344 return 0; 6.345 @@ -2327,7 +2356,8 @@ 6.346 main () 6.347 { 6.348 static int test_array [1 - 2 * !(($2) < 0)]; 6.349 -test_array [0] = 0 6.350 +test_array [0] = 0; 6.351 +return test_array [0]; 6.352 6.353 ; 6.354 return 0; 6.355 @@ -2343,7 +2373,8 @@ 6.356 main () 6.357 { 6.358 static int test_array [1 - 2 * !(($2) >= $ac_mid)]; 6.359 -test_array [0] = 0 6.360 +test_array [0] = 0; 6.361 +return test_array [0]; 6.362 6.363 ; 6.364 return 0; 6.365 @@ -2377,7 +2408,8 @@ 6.366 main () 6.367 { 6.368 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; 6.369 -test_array [0] = 0 6.370 +test_array [0] = 0; 6.371 +return test_array [0]; 6.372 6.373 ; 6.374 return 0; 6.375 @@ -2441,7 +2473,7 @@ 6.376 rm -f conftest.val 6.377 6.378 fi 6.379 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.380 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.381 as_fn_set_status $ac_retval 6.382 6.383 } # ac_fn_cxx_compute_int 6.384 @@ -2473,7 +2505,7 @@ 6.385 test ! -s conftest.err 6.386 } && test -s conftest$ac_exeext && { 6.387 test "$cross_compiling" = yes || 6.388 - $as_test_x conftest$ac_exeext 6.389 + test -x conftest$ac_exeext 6.390 }; then : 6.391 ac_retval=0 6.392 else 6.393 @@ -2487,7 +2519,7 @@ 6.394 # interfere with the next link command; also delete a directory that is 6.395 # left behind by Apple's compiler. We do this before executing the actions. 6.396 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 6.397 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.398 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.399 as_fn_set_status $ac_retval 6.400 6.401 } # ac_fn_cxx_try_link 6.402 @@ -2500,7 +2532,7 @@ 6.403 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6.404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 6.405 $as_echo_n "checking for $2... " >&6; } 6.406 -if eval "test \"\${$3+set}\"" = set; then : 6.407 +if eval \${$3+:} false; then : 6.408 $as_echo_n "(cached) " >&6 6.409 else 6.410 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.411 @@ -2555,7 +2587,7 @@ 6.412 eval ac_res=\$$3 6.413 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 6.414 $as_echo "$ac_res" >&6; } 6.415 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.416 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.417 6.418 } # ac_fn_cxx_check_func 6.419 6.420 @@ -2568,7 +2600,7 @@ 6.421 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6.422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 6.423 $as_echo_n "checking for $2... " >&6; } 6.424 -if eval "test \"\${$3+set}\"" = set; then : 6.425 +if eval \${$3+:} false; then : 6.426 $as_echo_n "(cached) " >&6 6.427 else 6.428 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.429 @@ -2586,7 +2618,7 @@ 6.430 eval ac_res=\$$3 6.431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 6.432 $as_echo "$ac_res" >&6; } 6.433 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 6.434 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6.435 6.436 } # ac_fn_c_check_header_compile 6.437 cat >config.log <<_ACEOF 6.438 @@ -2594,7 +2626,7 @@ 6.439 running configure, to aid debugging if configure makes a mistake. 6.440 6.441 It was created by OpenJDK $as_me jdk8, which was 6.442 -generated by GNU Autoconf 2.67. Invocation command line was 6.443 +generated by GNU Autoconf 2.69. Invocation command line was 6.444 6.445 $ $0 $@ 6.446 6.447 @@ -3438,7 +3470,7 @@ 6.448 pulse) 6.449 PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;; 6.450 x11) 6.451 - PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;; 6.452 + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;; 6.453 ccache) 6.454 PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; 6.455 * ) 6.456 @@ -3457,11 +3489,11 @@ 6.457 cups) 6.458 PKGHANDLER_COMMAND="sudo yum install cups-devel" ;; 6.459 freetype2) 6.460 - PKGHANDLER_COMMAND="sudo yum install freetype2-devel" ;; 6.461 + PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;; 6.462 pulse) 6.463 PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;; 6.464 x11) 6.465 - PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;; 6.466 + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;; 6.467 ccache) 6.468 PKGHANDLER_COMMAND="sudo yum install ccache" ;; 6.469 * ) 6.470 @@ -3794,7 +3826,7 @@ 6.471 #CUSTOM_AUTOCONF_INCLUDE 6.472 6.473 # Do not change or remove the following line, it is needed for consistency checks: 6.474 -DATE_WHEN_GENERATED=1376695332 6.475 +DATE_WHEN_GENERATED=1378403883 6.476 6.477 ############################################################################### 6.478 # 6.479 @@ -3832,7 +3864,7 @@ 6.480 set dummy $ac_prog; ac_word=$2 6.481 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.482 $as_echo_n "checking for $ac_word... " >&6; } 6.483 -if test "${ac_cv_path_BASENAME+set}" = set; then : 6.484 +if ${ac_cv_path_BASENAME+:} false; then : 6.485 $as_echo_n "(cached) " >&6 6.486 else 6.487 case $BASENAME in 6.488 @@ -3846,7 +3878,7 @@ 6.489 IFS=$as_save_IFS 6.490 test -z "$as_dir" && as_dir=. 6.491 for ac_exec_ext in '' $ac_executable_extensions; do 6.492 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.493 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.494 ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext" 6.495 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.496 break 2 6.497 @@ -3891,7 +3923,7 @@ 6.498 set dummy $ac_prog; ac_word=$2 6.499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.500 $as_echo_n "checking for $ac_word... " >&6; } 6.501 -if test "${ac_cv_path_BASH+set}" = set; then : 6.502 +if ${ac_cv_path_BASH+:} false; then : 6.503 $as_echo_n "(cached) " >&6 6.504 else 6.505 case $BASH in 6.506 @@ -3905,7 +3937,7 @@ 6.507 IFS=$as_save_IFS 6.508 test -z "$as_dir" && as_dir=. 6.509 for ac_exec_ext in '' $ac_executable_extensions; do 6.510 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.511 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.512 ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext" 6.513 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.514 break 2 6.515 @@ -3950,7 +3982,7 @@ 6.516 set dummy $ac_prog; ac_word=$2 6.517 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.518 $as_echo_n "checking for $ac_word... " >&6; } 6.519 -if test "${ac_cv_path_CAT+set}" = set; then : 6.520 +if ${ac_cv_path_CAT+:} false; then : 6.521 $as_echo_n "(cached) " >&6 6.522 else 6.523 case $CAT in 6.524 @@ -3964,7 +3996,7 @@ 6.525 IFS=$as_save_IFS 6.526 test -z "$as_dir" && as_dir=. 6.527 for ac_exec_ext in '' $ac_executable_extensions; do 6.528 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.529 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.530 ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext" 6.531 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.532 break 2 6.533 @@ -4009,7 +4041,7 @@ 6.534 set dummy $ac_prog; ac_word=$2 6.535 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.536 $as_echo_n "checking for $ac_word... " >&6; } 6.537 -if test "${ac_cv_path_CHMOD+set}" = set; then : 6.538 +if ${ac_cv_path_CHMOD+:} false; then : 6.539 $as_echo_n "(cached) " >&6 6.540 else 6.541 case $CHMOD in 6.542 @@ -4023,7 +4055,7 @@ 6.543 IFS=$as_save_IFS 6.544 test -z "$as_dir" && as_dir=. 6.545 for ac_exec_ext in '' $ac_executable_extensions; do 6.546 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.547 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.548 ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" 6.549 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.550 break 2 6.551 @@ -4068,7 +4100,7 @@ 6.552 set dummy $ac_prog; ac_word=$2 6.553 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.554 $as_echo_n "checking for $ac_word... " >&6; } 6.555 -if test "${ac_cv_path_CMP+set}" = set; then : 6.556 +if ${ac_cv_path_CMP+:} false; then : 6.557 $as_echo_n "(cached) " >&6 6.558 else 6.559 case $CMP in 6.560 @@ -4082,7 +4114,7 @@ 6.561 IFS=$as_save_IFS 6.562 test -z "$as_dir" && as_dir=. 6.563 for ac_exec_ext in '' $ac_executable_extensions; do 6.564 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.565 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.566 ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext" 6.567 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.568 break 2 6.569 @@ -4127,7 +4159,7 @@ 6.570 set dummy $ac_prog; ac_word=$2 6.571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.572 $as_echo_n "checking for $ac_word... " >&6; } 6.573 -if test "${ac_cv_path_COMM+set}" = set; then : 6.574 +if ${ac_cv_path_COMM+:} false; then : 6.575 $as_echo_n "(cached) " >&6 6.576 else 6.577 case $COMM in 6.578 @@ -4141,7 +4173,7 @@ 6.579 IFS=$as_save_IFS 6.580 test -z "$as_dir" && as_dir=. 6.581 for ac_exec_ext in '' $ac_executable_extensions; do 6.582 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.583 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.584 ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext" 6.585 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.586 break 2 6.587 @@ -4186,7 +4218,7 @@ 6.588 set dummy $ac_prog; ac_word=$2 6.589 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.590 $as_echo_n "checking for $ac_word... " >&6; } 6.591 -if test "${ac_cv_path_CP+set}" = set; then : 6.592 +if ${ac_cv_path_CP+:} false; then : 6.593 $as_echo_n "(cached) " >&6 6.594 else 6.595 case $CP in 6.596 @@ -4200,7 +4232,7 @@ 6.597 IFS=$as_save_IFS 6.598 test -z "$as_dir" && as_dir=. 6.599 for ac_exec_ext in '' $ac_executable_extensions; do 6.600 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.601 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.602 ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext" 6.603 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.604 break 2 6.605 @@ -4245,7 +4277,7 @@ 6.606 set dummy $ac_prog; ac_word=$2 6.607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.608 $as_echo_n "checking for $ac_word... " >&6; } 6.609 -if test "${ac_cv_path_CPIO+set}" = set; then : 6.610 +if ${ac_cv_path_CPIO+:} false; then : 6.611 $as_echo_n "(cached) " >&6 6.612 else 6.613 case $CPIO in 6.614 @@ -4259,7 +4291,7 @@ 6.615 IFS=$as_save_IFS 6.616 test -z "$as_dir" && as_dir=. 6.617 for ac_exec_ext in '' $ac_executable_extensions; do 6.618 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.619 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.620 ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 6.621 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.622 break 2 6.623 @@ -4304,7 +4336,7 @@ 6.624 set dummy $ac_prog; ac_word=$2 6.625 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.626 $as_echo_n "checking for $ac_word... " >&6; } 6.627 -if test "${ac_cv_path_CUT+set}" = set; then : 6.628 +if ${ac_cv_path_CUT+:} false; then : 6.629 $as_echo_n "(cached) " >&6 6.630 else 6.631 case $CUT in 6.632 @@ -4318,7 +4350,7 @@ 6.633 IFS=$as_save_IFS 6.634 test -z "$as_dir" && as_dir=. 6.635 for ac_exec_ext in '' $ac_executable_extensions; do 6.636 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.637 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.638 ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext" 6.639 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.640 break 2 6.641 @@ -4363,7 +4395,7 @@ 6.642 set dummy $ac_prog; ac_word=$2 6.643 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.644 $as_echo_n "checking for $ac_word... " >&6; } 6.645 -if test "${ac_cv_path_DATE+set}" = set; then : 6.646 +if ${ac_cv_path_DATE+:} false; then : 6.647 $as_echo_n "(cached) " >&6 6.648 else 6.649 case $DATE in 6.650 @@ -4377,7 +4409,7 @@ 6.651 IFS=$as_save_IFS 6.652 test -z "$as_dir" && as_dir=. 6.653 for ac_exec_ext in '' $ac_executable_extensions; do 6.654 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.655 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.656 ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext" 6.657 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.658 break 2 6.659 @@ -4422,7 +4454,7 @@ 6.660 set dummy $ac_prog; ac_word=$2 6.661 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.662 $as_echo_n "checking for $ac_word... " >&6; } 6.663 -if test "${ac_cv_path_DIFF+set}" = set; then : 6.664 +if ${ac_cv_path_DIFF+:} false; then : 6.665 $as_echo_n "(cached) " >&6 6.666 else 6.667 case $DIFF in 6.668 @@ -4436,7 +4468,7 @@ 6.669 IFS=$as_save_IFS 6.670 test -z "$as_dir" && as_dir=. 6.671 for ac_exec_ext in '' $ac_executable_extensions; do 6.672 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.673 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.674 ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext" 6.675 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.676 break 2 6.677 @@ -4481,7 +4513,7 @@ 6.678 set dummy $ac_prog; ac_word=$2 6.679 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.680 $as_echo_n "checking for $ac_word... " >&6; } 6.681 -if test "${ac_cv_path_DIRNAME+set}" = set; then : 6.682 +if ${ac_cv_path_DIRNAME+:} false; then : 6.683 $as_echo_n "(cached) " >&6 6.684 else 6.685 case $DIRNAME in 6.686 @@ -4495,7 +4527,7 @@ 6.687 IFS=$as_save_IFS 6.688 test -z "$as_dir" && as_dir=. 6.689 for ac_exec_ext in '' $ac_executable_extensions; do 6.690 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.691 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.692 ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext" 6.693 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.694 break 2 6.695 @@ -4540,7 +4572,7 @@ 6.696 set dummy $ac_prog; ac_word=$2 6.697 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.698 $as_echo_n "checking for $ac_word... " >&6; } 6.699 -if test "${ac_cv_path_ECHO+set}" = set; then : 6.700 +if ${ac_cv_path_ECHO+:} false; then : 6.701 $as_echo_n "(cached) " >&6 6.702 else 6.703 case $ECHO in 6.704 @@ -4554,7 +4586,7 @@ 6.705 IFS=$as_save_IFS 6.706 test -z "$as_dir" && as_dir=. 6.707 for ac_exec_ext in '' $ac_executable_extensions; do 6.708 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.709 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.710 ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext" 6.711 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.712 break 2 6.713 @@ -4599,7 +4631,7 @@ 6.714 set dummy $ac_prog; ac_word=$2 6.715 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.716 $as_echo_n "checking for $ac_word... " >&6; } 6.717 -if test "${ac_cv_path_EXPR+set}" = set; then : 6.718 +if ${ac_cv_path_EXPR+:} false; then : 6.719 $as_echo_n "(cached) " >&6 6.720 else 6.721 case $EXPR in 6.722 @@ -4613,7 +4645,7 @@ 6.723 IFS=$as_save_IFS 6.724 test -z "$as_dir" && as_dir=. 6.725 for ac_exec_ext in '' $ac_executable_extensions; do 6.726 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.727 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.728 ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext" 6.729 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.730 break 2 6.731 @@ -4658,7 +4690,7 @@ 6.732 set dummy $ac_prog; ac_word=$2 6.733 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.734 $as_echo_n "checking for $ac_word... " >&6; } 6.735 -if test "${ac_cv_path_FILE+set}" = set; then : 6.736 +if ${ac_cv_path_FILE+:} false; then : 6.737 $as_echo_n "(cached) " >&6 6.738 else 6.739 case $FILE in 6.740 @@ -4672,7 +4704,7 @@ 6.741 IFS=$as_save_IFS 6.742 test -z "$as_dir" && as_dir=. 6.743 for ac_exec_ext in '' $ac_executable_extensions; do 6.744 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.745 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.746 ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext" 6.747 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.748 break 2 6.749 @@ -4717,7 +4749,7 @@ 6.750 set dummy $ac_prog; ac_word=$2 6.751 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.752 $as_echo_n "checking for $ac_word... " >&6; } 6.753 -if test "${ac_cv_path_FIND+set}" = set; then : 6.754 +if ${ac_cv_path_FIND+:} false; then : 6.755 $as_echo_n "(cached) " >&6 6.756 else 6.757 case $FIND in 6.758 @@ -4731,7 +4763,7 @@ 6.759 IFS=$as_save_IFS 6.760 test -z "$as_dir" && as_dir=. 6.761 for ac_exec_ext in '' $ac_executable_extensions; do 6.762 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.763 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.764 ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext" 6.765 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.766 break 2 6.767 @@ -4776,7 +4808,7 @@ 6.768 set dummy $ac_prog; ac_word=$2 6.769 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.770 $as_echo_n "checking for $ac_word... " >&6; } 6.771 -if test "${ac_cv_path_HEAD+set}" = set; then : 6.772 +if ${ac_cv_path_HEAD+:} false; then : 6.773 $as_echo_n "(cached) " >&6 6.774 else 6.775 case $HEAD in 6.776 @@ -4790,7 +4822,7 @@ 6.777 IFS=$as_save_IFS 6.778 test -z "$as_dir" && as_dir=. 6.779 for ac_exec_ext in '' $ac_executable_extensions; do 6.780 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.781 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.782 ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext" 6.783 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.784 break 2 6.785 @@ -4835,7 +4867,7 @@ 6.786 set dummy $ac_prog; ac_word=$2 6.787 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.788 $as_echo_n "checking for $ac_word... " >&6; } 6.789 -if test "${ac_cv_path_LN+set}" = set; then : 6.790 +if ${ac_cv_path_LN+:} false; then : 6.791 $as_echo_n "(cached) " >&6 6.792 else 6.793 case $LN in 6.794 @@ -4849,7 +4881,7 @@ 6.795 IFS=$as_save_IFS 6.796 test -z "$as_dir" && as_dir=. 6.797 for ac_exec_ext in '' $ac_executable_extensions; do 6.798 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.799 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.800 ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" 6.801 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.802 break 2 6.803 @@ -4894,7 +4926,7 @@ 6.804 set dummy $ac_prog; ac_word=$2 6.805 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.806 $as_echo_n "checking for $ac_word... " >&6; } 6.807 -if test "${ac_cv_path_LS+set}" = set; then : 6.808 +if ${ac_cv_path_LS+:} false; then : 6.809 $as_echo_n "(cached) " >&6 6.810 else 6.811 case $LS in 6.812 @@ -4908,7 +4940,7 @@ 6.813 IFS=$as_save_IFS 6.814 test -z "$as_dir" && as_dir=. 6.815 for ac_exec_ext in '' $ac_executable_extensions; do 6.816 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.817 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.818 ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext" 6.819 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.820 break 2 6.821 @@ -4953,7 +4985,7 @@ 6.822 set dummy $ac_prog; ac_word=$2 6.823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.824 $as_echo_n "checking for $ac_word... " >&6; } 6.825 -if test "${ac_cv_path_MKDIR+set}" = set; then : 6.826 +if ${ac_cv_path_MKDIR+:} false; then : 6.827 $as_echo_n "(cached) " >&6 6.828 else 6.829 case $MKDIR in 6.830 @@ -4967,7 +4999,7 @@ 6.831 IFS=$as_save_IFS 6.832 test -z "$as_dir" && as_dir=. 6.833 for ac_exec_ext in '' $ac_executable_extensions; do 6.834 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.835 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.836 ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" 6.837 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.838 break 2 6.839 @@ -5012,7 +5044,7 @@ 6.840 set dummy $ac_prog; ac_word=$2 6.841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.842 $as_echo_n "checking for $ac_word... " >&6; } 6.843 -if test "${ac_cv_path_MKTEMP+set}" = set; then : 6.844 +if ${ac_cv_path_MKTEMP+:} false; then : 6.845 $as_echo_n "(cached) " >&6 6.846 else 6.847 case $MKTEMP in 6.848 @@ -5026,7 +5058,7 @@ 6.849 IFS=$as_save_IFS 6.850 test -z "$as_dir" && as_dir=. 6.851 for ac_exec_ext in '' $ac_executable_extensions; do 6.852 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.853 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.854 ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext" 6.855 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.856 break 2 6.857 @@ -5071,7 +5103,7 @@ 6.858 set dummy $ac_prog; ac_word=$2 6.859 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.860 $as_echo_n "checking for $ac_word... " >&6; } 6.861 -if test "${ac_cv_path_MV+set}" = set; then : 6.862 +if ${ac_cv_path_MV+:} false; then : 6.863 $as_echo_n "(cached) " >&6 6.864 else 6.865 case $MV in 6.866 @@ -5085,7 +5117,7 @@ 6.867 IFS=$as_save_IFS 6.868 test -z "$as_dir" && as_dir=. 6.869 for ac_exec_ext in '' $ac_executable_extensions; do 6.870 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.871 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.872 ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" 6.873 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.874 break 2 6.875 @@ -5130,7 +5162,7 @@ 6.876 set dummy $ac_prog; ac_word=$2 6.877 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.878 $as_echo_n "checking for $ac_word... " >&6; } 6.879 -if test "${ac_cv_path_PRINTF+set}" = set; then : 6.880 +if ${ac_cv_path_PRINTF+:} false; then : 6.881 $as_echo_n "(cached) " >&6 6.882 else 6.883 case $PRINTF in 6.884 @@ -5144,7 +5176,7 @@ 6.885 IFS=$as_save_IFS 6.886 test -z "$as_dir" && as_dir=. 6.887 for ac_exec_ext in '' $ac_executable_extensions; do 6.888 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.889 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.890 ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext" 6.891 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.892 break 2 6.893 @@ -5189,7 +5221,7 @@ 6.894 set dummy $ac_prog; ac_word=$2 6.895 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.896 $as_echo_n "checking for $ac_word... " >&6; } 6.897 -if test "${ac_cv_path_RM+set}" = set; then : 6.898 +if ${ac_cv_path_RM+:} false; then : 6.899 $as_echo_n "(cached) " >&6 6.900 else 6.901 case $RM in 6.902 @@ -5203,7 +5235,7 @@ 6.903 IFS=$as_save_IFS 6.904 test -z "$as_dir" && as_dir=. 6.905 for ac_exec_ext in '' $ac_executable_extensions; do 6.906 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.907 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.908 ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" 6.909 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.910 break 2 6.911 @@ -5248,7 +5280,7 @@ 6.912 set dummy $ac_prog; ac_word=$2 6.913 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.914 $as_echo_n "checking for $ac_word... " >&6; } 6.915 -if test "${ac_cv_path_SH+set}" = set; then : 6.916 +if ${ac_cv_path_SH+:} false; then : 6.917 $as_echo_n "(cached) " >&6 6.918 else 6.919 case $SH in 6.920 @@ -5262,7 +5294,7 @@ 6.921 IFS=$as_save_IFS 6.922 test -z "$as_dir" && as_dir=. 6.923 for ac_exec_ext in '' $ac_executable_extensions; do 6.924 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.925 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.926 ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" 6.927 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.928 break 2 6.929 @@ -5307,7 +5339,7 @@ 6.930 set dummy $ac_prog; ac_word=$2 6.931 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.932 $as_echo_n "checking for $ac_word... " >&6; } 6.933 -if test "${ac_cv_path_SORT+set}" = set; then : 6.934 +if ${ac_cv_path_SORT+:} false; then : 6.935 $as_echo_n "(cached) " >&6 6.936 else 6.937 case $SORT in 6.938 @@ -5321,7 +5353,7 @@ 6.939 IFS=$as_save_IFS 6.940 test -z "$as_dir" && as_dir=. 6.941 for ac_exec_ext in '' $ac_executable_extensions; do 6.942 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.943 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.944 ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext" 6.945 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.946 break 2 6.947 @@ -5366,7 +5398,7 @@ 6.948 set dummy $ac_prog; ac_word=$2 6.949 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.950 $as_echo_n "checking for $ac_word... " >&6; } 6.951 -if test "${ac_cv_path_TAIL+set}" = set; then : 6.952 +if ${ac_cv_path_TAIL+:} false; then : 6.953 $as_echo_n "(cached) " >&6 6.954 else 6.955 case $TAIL in 6.956 @@ -5380,7 +5412,7 @@ 6.957 IFS=$as_save_IFS 6.958 test -z "$as_dir" && as_dir=. 6.959 for ac_exec_ext in '' $ac_executable_extensions; do 6.960 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.961 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.962 ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext" 6.963 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.964 break 2 6.965 @@ -5425,7 +5457,7 @@ 6.966 set dummy $ac_prog; ac_word=$2 6.967 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.968 $as_echo_n "checking for $ac_word... " >&6; } 6.969 -if test "${ac_cv_path_TAR+set}" = set; then : 6.970 +if ${ac_cv_path_TAR+:} false; then : 6.971 $as_echo_n "(cached) " >&6 6.972 else 6.973 case $TAR in 6.974 @@ -5439,7 +5471,7 @@ 6.975 IFS=$as_save_IFS 6.976 test -z "$as_dir" && as_dir=. 6.977 for ac_exec_ext in '' $ac_executable_extensions; do 6.978 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.979 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.980 ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext" 6.981 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.982 break 2 6.983 @@ -5484,7 +5516,7 @@ 6.984 set dummy $ac_prog; ac_word=$2 6.985 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.986 $as_echo_n "checking for $ac_word... " >&6; } 6.987 -if test "${ac_cv_path_TEE+set}" = set; then : 6.988 +if ${ac_cv_path_TEE+:} false; then : 6.989 $as_echo_n "(cached) " >&6 6.990 else 6.991 case $TEE in 6.992 @@ -5498,7 +5530,7 @@ 6.993 IFS=$as_save_IFS 6.994 test -z "$as_dir" && as_dir=. 6.995 for ac_exec_ext in '' $ac_executable_extensions; do 6.996 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.997 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.998 ac_cv_path_TEE="$as_dir/$ac_word$ac_exec_ext" 6.999 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1000 break 2 6.1001 @@ -5543,7 +5575,7 @@ 6.1002 set dummy $ac_prog; ac_word=$2 6.1003 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1004 $as_echo_n "checking for $ac_word... " >&6; } 6.1005 -if test "${ac_cv_path_TOUCH+set}" = set; then : 6.1006 +if ${ac_cv_path_TOUCH+:} false; then : 6.1007 $as_echo_n "(cached) " >&6 6.1008 else 6.1009 case $TOUCH in 6.1010 @@ -5557,7 +5589,7 @@ 6.1011 IFS=$as_save_IFS 6.1012 test -z "$as_dir" && as_dir=. 6.1013 for ac_exec_ext in '' $ac_executable_extensions; do 6.1014 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1015 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1016 ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext" 6.1017 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1018 break 2 6.1019 @@ -5602,7 +5634,7 @@ 6.1020 set dummy $ac_prog; ac_word=$2 6.1021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1022 $as_echo_n "checking for $ac_word... " >&6; } 6.1023 -if test "${ac_cv_path_TR+set}" = set; then : 6.1024 +if ${ac_cv_path_TR+:} false; then : 6.1025 $as_echo_n "(cached) " >&6 6.1026 else 6.1027 case $TR in 6.1028 @@ -5616,7 +5648,7 @@ 6.1029 IFS=$as_save_IFS 6.1030 test -z "$as_dir" && as_dir=. 6.1031 for ac_exec_ext in '' $ac_executable_extensions; do 6.1032 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1033 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1034 ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext" 6.1035 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1036 break 2 6.1037 @@ -5661,7 +5693,7 @@ 6.1038 set dummy $ac_prog; ac_word=$2 6.1039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1040 $as_echo_n "checking for $ac_word... " >&6; } 6.1041 -if test "${ac_cv_path_UNAME+set}" = set; then : 6.1042 +if ${ac_cv_path_UNAME+:} false; then : 6.1043 $as_echo_n "(cached) " >&6 6.1044 else 6.1045 case $UNAME in 6.1046 @@ -5675,7 +5707,7 @@ 6.1047 IFS=$as_save_IFS 6.1048 test -z "$as_dir" && as_dir=. 6.1049 for ac_exec_ext in '' $ac_executable_extensions; do 6.1050 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1051 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1052 ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext" 6.1053 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1054 break 2 6.1055 @@ -5720,7 +5752,7 @@ 6.1056 set dummy $ac_prog; ac_word=$2 6.1057 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1058 $as_echo_n "checking for $ac_word... " >&6; } 6.1059 -if test "${ac_cv_path_UNIQ+set}" = set; then : 6.1060 +if ${ac_cv_path_UNIQ+:} false; then : 6.1061 $as_echo_n "(cached) " >&6 6.1062 else 6.1063 case $UNIQ in 6.1064 @@ -5734,7 +5766,7 @@ 6.1065 IFS=$as_save_IFS 6.1066 test -z "$as_dir" && as_dir=. 6.1067 for ac_exec_ext in '' $ac_executable_extensions; do 6.1068 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1069 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1070 ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext" 6.1071 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1072 break 2 6.1073 @@ -5779,7 +5811,7 @@ 6.1074 set dummy $ac_prog; ac_word=$2 6.1075 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1076 $as_echo_n "checking for $ac_word... " >&6; } 6.1077 -if test "${ac_cv_path_WC+set}" = set; then : 6.1078 +if ${ac_cv_path_WC+:} false; then : 6.1079 $as_echo_n "(cached) " >&6 6.1080 else 6.1081 case $WC in 6.1082 @@ -5793,7 +5825,7 @@ 6.1083 IFS=$as_save_IFS 6.1084 test -z "$as_dir" && as_dir=. 6.1085 for ac_exec_ext in '' $ac_executable_extensions; do 6.1086 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1087 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1088 ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext" 6.1089 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1090 break 2 6.1091 @@ -5838,7 +5870,7 @@ 6.1092 set dummy $ac_prog; ac_word=$2 6.1093 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1094 $as_echo_n "checking for $ac_word... " >&6; } 6.1095 -if test "${ac_cv_path_WHICH+set}" = set; then : 6.1096 +if ${ac_cv_path_WHICH+:} false; then : 6.1097 $as_echo_n "(cached) " >&6 6.1098 else 6.1099 case $WHICH in 6.1100 @@ -5852,7 +5884,7 @@ 6.1101 IFS=$as_save_IFS 6.1102 test -z "$as_dir" && as_dir=. 6.1103 for ac_exec_ext in '' $ac_executable_extensions; do 6.1104 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1105 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1106 ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext" 6.1107 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1108 break 2 6.1109 @@ -5897,7 +5929,7 @@ 6.1110 set dummy $ac_prog; ac_word=$2 6.1111 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1112 $as_echo_n "checking for $ac_word... " >&6; } 6.1113 -if test "${ac_cv_path_XARGS+set}" = set; then : 6.1114 +if ${ac_cv_path_XARGS+:} false; then : 6.1115 $as_echo_n "(cached) " >&6 6.1116 else 6.1117 case $XARGS in 6.1118 @@ -5911,7 +5943,7 @@ 6.1119 IFS=$as_save_IFS 6.1120 test -z "$as_dir" && as_dir=. 6.1121 for ac_exec_ext in '' $ac_executable_extensions; do 6.1122 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1123 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1124 ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext" 6.1125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1126 break 2 6.1127 @@ -5957,7 +5989,7 @@ 6.1128 set dummy $ac_prog; ac_word=$2 6.1129 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1130 $as_echo_n "checking for $ac_word... " >&6; } 6.1131 -if test "${ac_cv_prog_AWK+set}" = set; then : 6.1132 +if ${ac_cv_prog_AWK+:} false; then : 6.1133 $as_echo_n "(cached) " >&6 6.1134 else 6.1135 if test -n "$AWK"; then 6.1136 @@ -5969,7 +6001,7 @@ 6.1137 IFS=$as_save_IFS 6.1138 test -z "$as_dir" && as_dir=. 6.1139 for ac_exec_ext in '' $ac_executable_extensions; do 6.1140 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1141 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1142 ac_cv_prog_AWK="$ac_prog" 6.1143 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1144 break 2 6.1145 @@ -6007,7 +6039,7 @@ 6.1146 6.1147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 6.1148 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 6.1149 -if test "${ac_cv_path_GREP+set}" = set; then : 6.1150 +if ${ac_cv_path_GREP+:} false; then : 6.1151 $as_echo_n "(cached) " >&6 6.1152 else 6.1153 if test -z "$GREP"; then 6.1154 @@ -6021,7 +6053,7 @@ 6.1155 for ac_prog in grep ggrep; do 6.1156 for ac_exec_ext in '' $ac_executable_extensions; do 6.1157 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 6.1158 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 6.1159 + as_fn_executable_p "$ac_path_GREP" || continue 6.1160 # Check for GNU ac_path_GREP and select it if it is found. 6.1161 # Check for GNU $ac_path_GREP 6.1162 case `"$ac_path_GREP" --version 2>&1` in 6.1163 @@ -6082,7 +6114,7 @@ 6.1164 6.1165 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 6.1166 $as_echo_n "checking for egrep... " >&6; } 6.1167 -if test "${ac_cv_path_EGREP+set}" = set; then : 6.1168 +if ${ac_cv_path_EGREP+:} false; then : 6.1169 $as_echo_n "(cached) " >&6 6.1170 else 6.1171 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 6.1172 @@ -6099,7 +6131,7 @@ 6.1173 for ac_prog in egrep; do 6.1174 for ac_exec_ext in '' $ac_executable_extensions; do 6.1175 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 6.1176 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 6.1177 + as_fn_executable_p "$ac_path_EGREP" || continue 6.1178 # Check for GNU ac_path_EGREP and select it if it is found. 6.1179 # Check for GNU $ac_path_EGREP 6.1180 case `"$ac_path_EGREP" --version 2>&1` in 6.1181 @@ -6161,7 +6193,7 @@ 6.1182 6.1183 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 6.1184 $as_echo_n "checking for fgrep... " >&6; } 6.1185 -if test "${ac_cv_path_FGREP+set}" = set; then : 6.1186 +if ${ac_cv_path_FGREP+:} false; then : 6.1187 $as_echo_n "(cached) " >&6 6.1188 else 6.1189 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 6.1190 @@ -6178,7 +6210,7 @@ 6.1191 for ac_prog in fgrep; do 6.1192 for ac_exec_ext in '' $ac_executable_extensions; do 6.1193 ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" 6.1194 - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue 6.1195 + as_fn_executable_p "$ac_path_FGREP" || continue 6.1196 # Check for GNU ac_path_FGREP and select it if it is found. 6.1197 # Check for GNU $ac_path_FGREP 6.1198 case `"$ac_path_FGREP" --version 2>&1` in 6.1199 @@ -6240,7 +6272,7 @@ 6.1200 6.1201 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 6.1202 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 6.1203 -if test "${ac_cv_path_SED+set}" = set; then : 6.1204 +if ${ac_cv_path_SED+:} false; then : 6.1205 $as_echo_n "(cached) " >&6 6.1206 else 6.1207 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 6.1208 @@ -6260,7 +6292,7 @@ 6.1209 for ac_prog in sed gsed; do 6.1210 for ac_exec_ext in '' $ac_executable_extensions; do 6.1211 ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" 6.1212 - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue 6.1213 + as_fn_executable_p "$ac_path_SED" || continue 6.1214 # Check for GNU ac_path_SED and select it if it is found. 6.1215 # Check for GNU $ac_path_SED 6.1216 case `"$ac_path_SED" --version 2>&1` in 6.1217 @@ -6326,7 +6358,7 @@ 6.1218 set dummy $ac_prog; ac_word=$2 6.1219 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1220 $as_echo_n "checking for $ac_word... " >&6; } 6.1221 -if test "${ac_cv_path_NAWK+set}" = set; then : 6.1222 +if ${ac_cv_path_NAWK+:} false; then : 6.1223 $as_echo_n "(cached) " >&6 6.1224 else 6.1225 case $NAWK in 6.1226 @@ -6340,7 +6372,7 @@ 6.1227 IFS=$as_save_IFS 6.1228 test -z "$as_dir" && as_dir=. 6.1229 for ac_exec_ext in '' $ac_executable_extensions; do 6.1230 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1231 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1232 ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext" 6.1233 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1234 break 2 6.1235 @@ -6390,7 +6422,7 @@ 6.1236 set dummy cygpath; ac_word=$2 6.1237 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1238 $as_echo_n "checking for $ac_word... " >&6; } 6.1239 -if test "${ac_cv_path_CYGPATH+set}" = set; then : 6.1240 +if ${ac_cv_path_CYGPATH+:} false; then : 6.1241 $as_echo_n "(cached) " >&6 6.1242 else 6.1243 case $CYGPATH in 6.1244 @@ -6404,7 +6436,7 @@ 6.1245 IFS=$as_save_IFS 6.1246 test -z "$as_dir" && as_dir=. 6.1247 for ac_exec_ext in '' $ac_executable_extensions; do 6.1248 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1249 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1250 ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext" 6.1251 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1252 break 2 6.1253 @@ -6430,7 +6462,7 @@ 6.1254 set dummy readlink; ac_word=$2 6.1255 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1256 $as_echo_n "checking for $ac_word... " >&6; } 6.1257 -if test "${ac_cv_path_READLINK+set}" = set; then : 6.1258 +if ${ac_cv_path_READLINK+:} false; then : 6.1259 $as_echo_n "(cached) " >&6 6.1260 else 6.1261 case $READLINK in 6.1262 @@ -6444,7 +6476,7 @@ 6.1263 IFS=$as_save_IFS 6.1264 test -z "$as_dir" && as_dir=. 6.1265 for ac_exec_ext in '' $ac_executable_extensions; do 6.1266 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1267 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1268 ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext" 6.1269 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1270 break 2 6.1271 @@ -6470,7 +6502,7 @@ 6.1272 set dummy df; ac_word=$2 6.1273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1274 $as_echo_n "checking for $ac_word... " >&6; } 6.1275 -if test "${ac_cv_path_DF+set}" = set; then : 6.1276 +if ${ac_cv_path_DF+:} false; then : 6.1277 $as_echo_n "(cached) " >&6 6.1278 else 6.1279 case $DF in 6.1280 @@ -6484,7 +6516,7 @@ 6.1281 IFS=$as_save_IFS 6.1282 test -z "$as_dir" && as_dir=. 6.1283 for ac_exec_ext in '' $ac_executable_extensions; do 6.1284 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1285 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1286 ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext" 6.1287 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1288 break 2 6.1289 @@ -6510,7 +6542,7 @@ 6.1290 set dummy SetFile; ac_word=$2 6.1291 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1292 $as_echo_n "checking for $ac_word... " >&6; } 6.1293 -if test "${ac_cv_path_SETFILE+set}" = set; then : 6.1294 +if ${ac_cv_path_SETFILE+:} false; then : 6.1295 $as_echo_n "(cached) " >&6 6.1296 else 6.1297 case $SETFILE in 6.1298 @@ -6524,7 +6556,7 @@ 6.1299 IFS=$as_save_IFS 6.1300 test -z "$as_dir" && as_dir=. 6.1301 for ac_exec_ext in '' $ac_executable_extensions; do 6.1302 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1303 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1304 ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext" 6.1305 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1306 break 2 6.1307 @@ -6556,7 +6588,7 @@ 6.1308 6.1309 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 6.1310 $as_echo_n "checking build system type... " >&6; } 6.1311 -if test "${ac_cv_build+set}" = set; then : 6.1312 +if ${ac_cv_build+:} false; then : 6.1313 $as_echo_n "(cached) " >&6 6.1314 else 6.1315 ac_build_alias=$build_alias 6.1316 @@ -6590,7 +6622,7 @@ 6.1317 6.1318 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 6.1319 $as_echo_n "checking host system type... " >&6; } 6.1320 -if test "${ac_cv_host+set}" = set; then : 6.1321 +if ${ac_cv_host+:} false; then : 6.1322 $as_echo_n "(cached) " >&6 6.1323 else 6.1324 if test "x$host_alias" = x; then 6.1325 @@ -6623,7 +6655,7 @@ 6.1326 6.1327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 6.1328 $as_echo_n "checking target system type... " >&6; } 6.1329 -if test "${ac_cv_target+set}" = set; then : 6.1330 +if ${ac_cv_target+:} false; then : 6.1331 $as_echo_n "(cached) " >&6 6.1332 else 6.1333 if test "x$target_alias" = x; then 6.1334 @@ -8205,7 +8237,7 @@ 6.1335 set dummy $ac_prog; ac_word=$2 6.1336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1337 $as_echo_n "checking for $ac_word... " >&6; } 6.1338 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 6.1339 +if ${ac_cv_prog_PKGHANDLER+:} false; then : 6.1340 $as_echo_n "(cached) " >&6 6.1341 else 6.1342 if test -n "$PKGHANDLER"; then 6.1343 @@ -8217,7 +8249,7 @@ 6.1344 IFS=$as_save_IFS 6.1345 test -z "$as_dir" && as_dir=. 6.1346 for ac_exec_ext in '' $ac_executable_extensions; do 6.1347 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1348 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1349 ac_cv_prog_PKGHANDLER="$ac_prog" 6.1350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1351 break 2 6.1352 @@ -8570,7 +8602,7 @@ 6.1353 set dummy $ac_prog; ac_word=$2 6.1354 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1355 $as_echo_n "checking for $ac_word... " >&6; } 6.1356 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 6.1357 +if ${ac_cv_path_CHECK_GMAKE+:} false; then : 6.1358 $as_echo_n "(cached) " >&6 6.1359 else 6.1360 case $CHECK_GMAKE in 6.1361 @@ -8584,7 +8616,7 @@ 6.1362 IFS=$as_save_IFS 6.1363 test -z "$as_dir" && as_dir=. 6.1364 for ac_exec_ext in '' $ac_executable_extensions; do 6.1365 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1366 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1367 ac_cv_path_CHECK_GMAKE="$as_dir/$ac_word$ac_exec_ext" 6.1368 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1369 break 2 6.1370 @@ -8924,7 +8956,7 @@ 6.1371 set dummy $ac_prog; ac_word=$2 6.1372 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1373 $as_echo_n "checking for $ac_word... " >&6; } 6.1374 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 6.1375 +if ${ac_cv_path_CHECK_MAKE+:} false; then : 6.1376 $as_echo_n "(cached) " >&6 6.1377 else 6.1378 case $CHECK_MAKE in 6.1379 @@ -8938,7 +8970,7 @@ 6.1380 IFS=$as_save_IFS 6.1381 test -z "$as_dir" && as_dir=. 6.1382 for ac_exec_ext in '' $ac_executable_extensions; do 6.1383 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1384 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1385 ac_cv_path_CHECK_MAKE="$as_dir/$ac_word$ac_exec_ext" 6.1386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1387 break 2 6.1388 @@ -9283,7 +9315,7 @@ 6.1389 set dummy $ac_prog; ac_word=$2 6.1390 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1391 $as_echo_n "checking for $ac_word... " >&6; } 6.1392 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 6.1393 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 6.1394 $as_echo_n "(cached) " >&6 6.1395 else 6.1396 case $CHECK_TOOLSDIR_GMAKE in 6.1397 @@ -9297,7 +9329,7 @@ 6.1398 IFS=$as_save_IFS 6.1399 test -z "$as_dir" && as_dir=. 6.1400 for ac_exec_ext in '' $ac_executable_extensions; do 6.1401 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1402 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1403 ac_cv_path_CHECK_TOOLSDIR_GMAKE="$as_dir/$ac_word$ac_exec_ext" 6.1404 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1405 break 2 6.1406 @@ -9636,7 +9668,7 @@ 6.1407 set dummy $ac_prog; ac_word=$2 6.1408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1409 $as_echo_n "checking for $ac_word... " >&6; } 6.1410 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 6.1411 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 6.1412 $as_echo_n "(cached) " >&6 6.1413 else 6.1414 case $CHECK_TOOLSDIR_MAKE in 6.1415 @@ -9650,7 +9682,7 @@ 6.1416 IFS=$as_save_IFS 6.1417 test -z "$as_dir" && as_dir=. 6.1418 for ac_exec_ext in '' $ac_executable_extensions; do 6.1419 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1420 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1421 ac_cv_path_CHECK_TOOLSDIR_MAKE="$as_dir/$ac_word$ac_exec_ext" 6.1422 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1423 break 2 6.1424 @@ -10032,7 +10064,7 @@ 6.1425 set dummy $ac_prog; ac_word=$2 6.1426 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1427 $as_echo_n "checking for $ac_word... " >&6; } 6.1428 -if test "${ac_cv_path_UNZIP+set}" = set; then : 6.1429 +if ${ac_cv_path_UNZIP+:} false; then : 6.1430 $as_echo_n "(cached) " >&6 6.1431 else 6.1432 case $UNZIP in 6.1433 @@ -10046,7 +10078,7 @@ 6.1434 IFS=$as_save_IFS 6.1435 test -z "$as_dir" && as_dir=. 6.1436 for ac_exec_ext in '' $ac_executable_extensions; do 6.1437 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1438 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1439 ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" 6.1440 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1441 break 2 6.1442 @@ -10091,7 +10123,7 @@ 6.1443 set dummy $ac_prog; ac_word=$2 6.1444 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1445 $as_echo_n "checking for $ac_word... " >&6; } 6.1446 -if test "${ac_cv_path_ZIP+set}" = set; then : 6.1447 +if ${ac_cv_path_ZIP+:} false; then : 6.1448 $as_echo_n "(cached) " >&6 6.1449 else 6.1450 case $ZIP in 6.1451 @@ -10105,7 +10137,7 @@ 6.1452 IFS=$as_save_IFS 6.1453 test -z "$as_dir" && as_dir=. 6.1454 for ac_exec_ext in '' $ac_executable_extensions; do 6.1455 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1456 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1457 ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" 6.1458 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1459 break 2 6.1460 @@ -10150,7 +10182,7 @@ 6.1461 set dummy ldd; ac_word=$2 6.1462 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1463 $as_echo_n "checking for $ac_word... " >&6; } 6.1464 -if test "${ac_cv_path_LDD+set}" = set; then : 6.1465 +if ${ac_cv_path_LDD+:} false; then : 6.1466 $as_echo_n "(cached) " >&6 6.1467 else 6.1468 case $LDD in 6.1469 @@ -10164,7 +10196,7 @@ 6.1470 IFS=$as_save_IFS 6.1471 test -z "$as_dir" && as_dir=. 6.1472 for ac_exec_ext in '' $ac_executable_extensions; do 6.1473 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1474 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1475 ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext" 6.1476 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1477 break 2 6.1478 @@ -10196,7 +10228,7 @@ 6.1479 set dummy otool; ac_word=$2 6.1480 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1481 $as_echo_n "checking for $ac_word... " >&6; } 6.1482 -if test "${ac_cv_path_OTOOL+set}" = set; then : 6.1483 +if ${ac_cv_path_OTOOL+:} false; then : 6.1484 $as_echo_n "(cached) " >&6 6.1485 else 6.1486 case $OTOOL in 6.1487 @@ -10210,7 +10242,7 @@ 6.1488 IFS=$as_save_IFS 6.1489 test -z "$as_dir" && as_dir=. 6.1490 for ac_exec_ext in '' $ac_executable_extensions; do 6.1491 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1492 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1493 ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext" 6.1494 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1495 break 2 6.1496 @@ -10241,7 +10273,7 @@ 6.1497 set dummy $ac_prog; ac_word=$2 6.1498 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1499 $as_echo_n "checking for $ac_word... " >&6; } 6.1500 -if test "${ac_cv_path_READELF+set}" = set; then : 6.1501 +if ${ac_cv_path_READELF+:} false; then : 6.1502 $as_echo_n "(cached) " >&6 6.1503 else 6.1504 case $READELF in 6.1505 @@ -10255,7 +10287,7 @@ 6.1506 IFS=$as_save_IFS 6.1507 test -z "$as_dir" && as_dir=. 6.1508 for ac_exec_ext in '' $ac_executable_extensions; do 6.1509 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1510 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1511 ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext" 6.1512 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1513 break 2 6.1514 @@ -10284,7 +10316,7 @@ 6.1515 set dummy hg; ac_word=$2 6.1516 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1517 $as_echo_n "checking for $ac_word... " >&6; } 6.1518 -if test "${ac_cv_path_HG+set}" = set; then : 6.1519 +if ${ac_cv_path_HG+:} false; then : 6.1520 $as_echo_n "(cached) " >&6 6.1521 else 6.1522 case $HG in 6.1523 @@ -10298,7 +10330,7 @@ 6.1524 IFS=$as_save_IFS 6.1525 test -z "$as_dir" && as_dir=. 6.1526 for ac_exec_ext in '' $ac_executable_extensions; do 6.1527 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1528 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1529 ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext" 6.1530 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1531 break 2 6.1532 @@ -10324,7 +10356,7 @@ 6.1533 set dummy stat; ac_word=$2 6.1534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1535 $as_echo_n "checking for $ac_word... " >&6; } 6.1536 -if test "${ac_cv_path_STAT+set}" = set; then : 6.1537 +if ${ac_cv_path_STAT+:} false; then : 6.1538 $as_echo_n "(cached) " >&6 6.1539 else 6.1540 case $STAT in 6.1541 @@ -10338,7 +10370,7 @@ 6.1542 IFS=$as_save_IFS 6.1543 test -z "$as_dir" && as_dir=. 6.1544 for ac_exec_ext in '' $ac_executable_extensions; do 6.1545 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1546 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1547 ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext" 6.1548 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1549 break 2 6.1550 @@ -10364,7 +10396,7 @@ 6.1551 set dummy time; ac_word=$2 6.1552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1553 $as_echo_n "checking for $ac_word... " >&6; } 6.1554 -if test "${ac_cv_path_TIME+set}" = set; then : 6.1555 +if ${ac_cv_path_TIME+:} false; then : 6.1556 $as_echo_n "(cached) " >&6 6.1557 else 6.1558 case $TIME in 6.1559 @@ -10378,7 +10410,7 @@ 6.1560 IFS=$as_save_IFS 6.1561 test -z "$as_dir" && as_dir=. 6.1562 for ac_exec_ext in '' $ac_executable_extensions; do 6.1563 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1564 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1565 ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext" 6.1566 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1567 break 2 6.1568 @@ -10417,7 +10449,7 @@ 6.1569 set dummy $ac_prog; ac_word=$2 6.1570 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1571 $as_echo_n "checking for $ac_word... " >&6; } 6.1572 -if test "${ac_cv_path_COMM+set}" = set; then : 6.1573 +if ${ac_cv_path_COMM+:} false; then : 6.1574 $as_echo_n "(cached) " >&6 6.1575 else 6.1576 case $COMM in 6.1577 @@ -10431,7 +10463,7 @@ 6.1578 IFS=$as_save_IFS 6.1579 test -z "$as_dir" && as_dir=. 6.1580 for ac_exec_ext in '' $ac_executable_extensions; do 6.1581 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1582 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1583 ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext" 6.1584 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1585 break 2 6.1586 @@ -10479,7 +10511,7 @@ 6.1587 set dummy $ac_prog; ac_word=$2 6.1588 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1589 $as_echo_n "checking for $ac_word... " >&6; } 6.1590 -if test "${ac_cv_path_XATTR+set}" = set; then : 6.1591 +if ${ac_cv_path_XATTR+:} false; then : 6.1592 $as_echo_n "(cached) " >&6 6.1593 else 6.1594 case $XATTR in 6.1595 @@ -10493,7 +10525,7 @@ 6.1596 IFS=$as_save_IFS 6.1597 test -z "$as_dir" && as_dir=. 6.1598 for ac_exec_ext in '' $ac_executable_extensions; do 6.1599 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1600 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1601 ac_cv_path_XATTR="$as_dir/$ac_word$ac_exec_ext" 6.1602 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1603 break 2 6.1604 @@ -10535,7 +10567,7 @@ 6.1605 set dummy codesign; ac_word=$2 6.1606 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1607 $as_echo_n "checking for $ac_word... " >&6; } 6.1608 -if test "${ac_cv_path_CODESIGN+set}" = set; then : 6.1609 +if ${ac_cv_path_CODESIGN+:} false; then : 6.1610 $as_echo_n "(cached) " >&6 6.1611 else 6.1612 case $CODESIGN in 6.1613 @@ -10549,7 +10581,7 @@ 6.1614 IFS=$as_save_IFS 6.1615 test -z "$as_dir" && as_dir=. 6.1616 for ac_exec_ext in '' $ac_executable_extensions; do 6.1617 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1618 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1619 ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext" 6.1620 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1621 break 2 6.1622 @@ -10599,7 +10631,7 @@ 6.1623 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 6.1624 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1625 $as_echo_n "checking for $ac_word... " >&6; } 6.1626 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 6.1627 +if ${ac_cv_path_PKG_CONFIG+:} false; then : 6.1628 $as_echo_n "(cached) " >&6 6.1629 else 6.1630 case $PKG_CONFIG in 6.1631 @@ -10613,7 +10645,7 @@ 6.1632 IFS=$as_save_IFS 6.1633 test -z "$as_dir" && as_dir=. 6.1634 for ac_exec_ext in '' $ac_executable_extensions; do 6.1635 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1636 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1637 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 6.1638 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1639 break 2 6.1640 @@ -10642,7 +10674,7 @@ 6.1641 set dummy pkg-config; ac_word=$2 6.1642 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1643 $as_echo_n "checking for $ac_word... " >&6; } 6.1644 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 6.1645 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 6.1646 $as_echo_n "(cached) " >&6 6.1647 else 6.1648 case $ac_pt_PKG_CONFIG in 6.1649 @@ -10656,7 +10688,7 @@ 6.1650 IFS=$as_save_IFS 6.1651 test -z "$as_dir" && as_dir=. 6.1652 for ac_exec_ext in '' $ac_executable_extensions; do 6.1653 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1654 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1655 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 6.1656 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1657 break 2 6.1658 @@ -10815,7 +10847,7 @@ 6.1659 set dummy $ac_prog; ac_word=$2 6.1660 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1661 $as_echo_n "checking for $ac_word... " >&6; } 6.1662 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 6.1663 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 6.1664 $as_echo_n "(cached) " >&6 6.1665 else 6.1666 if test -n "$BDEPS_UNZIP"; then 6.1667 @@ -10827,7 +10859,7 @@ 6.1668 IFS=$as_save_IFS 6.1669 test -z "$as_dir" && as_dir=. 6.1670 for ac_exec_ext in '' $ac_executable_extensions; do 6.1671 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1672 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1673 ac_cv_prog_BDEPS_UNZIP="$ac_prog" 6.1674 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1675 break 2 6.1676 @@ -10861,7 +10893,7 @@ 6.1677 set dummy $ac_prog; ac_word=$2 6.1678 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1679 $as_echo_n "checking for $ac_word... " >&6; } 6.1680 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 6.1681 +if ${ac_cv_prog_BDEPS_FTP+:} false; then : 6.1682 $as_echo_n "(cached) " >&6 6.1683 else 6.1684 if test -n "$BDEPS_FTP"; then 6.1685 @@ -10873,7 +10905,7 @@ 6.1686 IFS=$as_save_IFS 6.1687 test -z "$as_dir" && as_dir=. 6.1688 for ac_exec_ext in '' $ac_executable_extensions; do 6.1689 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1690 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1691 ac_cv_prog_BDEPS_FTP="$ac_prog" 6.1692 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1693 break 2 6.1694 @@ -12157,7 +12189,7 @@ 6.1695 set dummy javac; ac_word=$2 6.1696 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1697 $as_echo_n "checking for $ac_word... " >&6; } 6.1698 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 6.1699 +if ${ac_cv_path_JAVAC_CHECK+:} false; then : 6.1700 $as_echo_n "(cached) " >&6 6.1701 else 6.1702 case $JAVAC_CHECK in 6.1703 @@ -12171,7 +12203,7 @@ 6.1704 IFS=$as_save_IFS 6.1705 test -z "$as_dir" && as_dir=. 6.1706 for ac_exec_ext in '' $ac_executable_extensions; do 6.1707 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1708 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1709 ac_cv_path_JAVAC_CHECK="$as_dir/$ac_word$ac_exec_ext" 6.1710 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1711 break 2 6.1712 @@ -12197,7 +12229,7 @@ 6.1713 set dummy java; ac_word=$2 6.1714 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1715 $as_echo_n "checking for $ac_word... " >&6; } 6.1716 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 6.1717 +if ${ac_cv_path_JAVA_CHECK+:} false; then : 6.1718 $as_echo_n "(cached) " >&6 6.1719 else 6.1720 case $JAVA_CHECK in 6.1721 @@ -12211,7 +12243,7 @@ 6.1722 IFS=$as_save_IFS 6.1723 test -z "$as_dir" && as_dir=. 6.1724 for ac_exec_ext in '' $ac_executable_extensions; do 6.1725 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1726 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1727 ac_cv_path_JAVA_CHECK="$as_dir/$ac_word$ac_exec_ext" 6.1728 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1729 break 2 6.1730 @@ -16526,7 +16558,7 @@ 6.1731 set dummy $ac_prog; ac_word=$2 6.1732 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1733 $as_echo_n "checking for $ac_word... " >&6; } 6.1734 -if test "${ac_cv_path_JTREGEXE+set}" = set; then : 6.1735 +if ${ac_cv_path_JTREGEXE+:} false; then : 6.1736 $as_echo_n "(cached) " >&6 6.1737 else 6.1738 case $JTREGEXE in 6.1739 @@ -16540,7 +16572,7 @@ 6.1740 IFS=$as_save_IFS 6.1741 test -z "$as_dir" && as_dir=. 6.1742 for ac_exec_ext in '' $ac_executable_extensions; do 6.1743 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1744 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1745 ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext" 6.1746 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1747 break 2 6.1748 @@ -16594,7 +16626,7 @@ 6.1749 set dummy link; ac_word=$2 6.1750 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1751 $as_echo_n "checking for $ac_word... " >&6; } 6.1752 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 6.1753 +if ${ac_cv_path_CYGWIN_LINK+:} false; then : 6.1754 $as_echo_n "(cached) " >&6 6.1755 else 6.1756 case $CYGWIN_LINK in 6.1757 @@ -16608,7 +16640,7 @@ 6.1758 IFS=$as_save_IFS 6.1759 test -z "$as_dir" && as_dir=. 6.1760 for ac_exec_ext in '' $ac_executable_extensions; do 6.1761 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1762 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1763 ac_cv_path_CYGWIN_LINK="$as_dir/$ac_word$ac_exec_ext" 6.1764 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1765 break 2 6.1766 @@ -18037,7 +18069,7 @@ 6.1767 set dummy $ac_prog; ac_word=$2 6.1768 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1769 $as_echo_n "checking for $ac_word... " >&6; } 6.1770 -if test "${ac_cv_path_BUILD_CC+set}" = set; then : 6.1771 +if ${ac_cv_path_BUILD_CC+:} false; then : 6.1772 $as_echo_n "(cached) " >&6 6.1773 else 6.1774 case $BUILD_CC in 6.1775 @@ -18051,7 +18083,7 @@ 6.1776 IFS=$as_save_IFS 6.1777 test -z "$as_dir" && as_dir=. 6.1778 for ac_exec_ext in '' $ac_executable_extensions; do 6.1779 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1780 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1781 ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext" 6.1782 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1783 break 2 6.1784 @@ -18348,7 +18380,7 @@ 6.1785 set dummy $ac_prog; ac_word=$2 6.1786 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1787 $as_echo_n "checking for $ac_word... " >&6; } 6.1788 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 6.1789 +if ${ac_cv_path_BUILD_CXX+:} false; then : 6.1790 $as_echo_n "(cached) " >&6 6.1791 else 6.1792 case $BUILD_CXX in 6.1793 @@ -18362,7 +18394,7 @@ 6.1794 IFS=$as_save_IFS 6.1795 test -z "$as_dir" && as_dir=. 6.1796 for ac_exec_ext in '' $ac_executable_extensions; do 6.1797 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1798 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1799 ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext" 6.1800 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1801 break 2 6.1802 @@ -18657,7 +18689,7 @@ 6.1803 set dummy ld; ac_word=$2 6.1804 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1805 $as_echo_n "checking for $ac_word... " >&6; } 6.1806 -if test "${ac_cv_path_BUILD_LD+set}" = set; then : 6.1807 +if ${ac_cv_path_BUILD_LD+:} false; then : 6.1808 $as_echo_n "(cached) " >&6 6.1809 else 6.1810 case $BUILD_LD in 6.1811 @@ -18671,7 +18703,7 @@ 6.1812 IFS=$as_save_IFS 6.1813 test -z "$as_dir" && as_dir=. 6.1814 for ac_exec_ext in '' $ac_executable_extensions; do 6.1815 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1816 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1817 ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext" 6.1818 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1819 break 2 6.1820 @@ -19164,7 +19196,7 @@ 6.1821 set dummy $ac_prog; ac_word=$2 6.1822 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1823 $as_echo_n "checking for $ac_word... " >&6; } 6.1824 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 6.1825 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 6.1826 $as_echo_n "(cached) " >&6 6.1827 else 6.1828 case $TOOLS_DIR_CC in 6.1829 @@ -19178,7 +19210,7 @@ 6.1830 IFS=$as_save_IFS 6.1831 test -z "$as_dir" && as_dir=. 6.1832 for ac_exec_ext in '' $ac_executable_extensions; do 6.1833 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1834 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1835 ac_cv_path_TOOLS_DIR_CC="$as_dir/$ac_word$ac_exec_ext" 6.1836 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1837 break 2 6.1838 @@ -19216,7 +19248,7 @@ 6.1839 set dummy $ac_prog; ac_word=$2 6.1840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1841 $as_echo_n "checking for $ac_word... " >&6; } 6.1842 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 6.1843 +if ${ac_cv_path_POTENTIAL_CC+:} false; then : 6.1844 $as_echo_n "(cached) " >&6 6.1845 else 6.1846 case $POTENTIAL_CC in 6.1847 @@ -19230,7 +19262,7 @@ 6.1848 IFS=$as_save_IFS 6.1849 test -z "$as_dir" && as_dir=. 6.1850 for ac_exec_ext in '' $ac_executable_extensions; do 6.1851 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1852 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1853 ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext" 6.1854 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1855 break 2 6.1856 @@ -19629,7 +19661,7 @@ 6.1857 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.1858 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1859 $as_echo_n "checking for $ac_word... " >&6; } 6.1860 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 6.1861 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 6.1862 $as_echo_n "(cached) " >&6 6.1863 else 6.1864 if test -n "$PROPER_COMPILER_CC"; then 6.1865 @@ -19641,7 +19673,7 @@ 6.1866 IFS=$as_save_IFS 6.1867 test -z "$as_dir" && as_dir=. 6.1868 for ac_exec_ext in '' $ac_executable_extensions; do 6.1869 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1870 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1871 ac_cv_prog_PROPER_COMPILER_CC="$ac_tool_prefix$ac_prog" 6.1872 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1873 break 2 6.1874 @@ -19673,7 +19705,7 @@ 6.1875 set dummy $ac_prog; ac_word=$2 6.1876 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1877 $as_echo_n "checking for $ac_word... " >&6; } 6.1878 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 6.1879 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 6.1880 $as_echo_n "(cached) " >&6 6.1881 else 6.1882 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 6.1883 @@ -19685,7 +19717,7 @@ 6.1884 IFS=$as_save_IFS 6.1885 test -z "$as_dir" && as_dir=. 6.1886 for ac_exec_ext in '' $ac_executable_extensions; do 6.1887 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1888 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1889 ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_prog" 6.1890 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1891 break 2 6.1892 @@ -20123,7 +20155,7 @@ 6.1893 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.1894 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1895 $as_echo_n "checking for $ac_word... " >&6; } 6.1896 -if test "${ac_cv_prog_CC+set}" = set; then : 6.1897 +if ${ac_cv_prog_CC+:} false; then : 6.1898 $as_echo_n "(cached) " >&6 6.1899 else 6.1900 if test -n "$CC"; then 6.1901 @@ -20135,7 +20167,7 @@ 6.1902 IFS=$as_save_IFS 6.1903 test -z "$as_dir" && as_dir=. 6.1904 for ac_exec_ext in '' $ac_executable_extensions; do 6.1905 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1906 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1907 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 6.1908 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1909 break 2 6.1910 @@ -20167,7 +20199,7 @@ 6.1911 set dummy $ac_prog; ac_word=$2 6.1912 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1913 $as_echo_n "checking for $ac_word... " >&6; } 6.1914 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 6.1915 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 6.1916 $as_echo_n "(cached) " >&6 6.1917 else 6.1918 if test -n "$ac_ct_CC"; then 6.1919 @@ -20179,7 +20211,7 @@ 6.1920 IFS=$as_save_IFS 6.1921 test -z "$as_dir" && as_dir=. 6.1922 for ac_exec_ext in '' $ac_executable_extensions; do 6.1923 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1924 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1925 ac_cv_prog_ac_ct_CC="$ac_prog" 6.1926 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1927 break 2 6.1928 @@ -20448,7 +20480,7 @@ 6.1929 ac_clean_files=$ac_clean_files_save 6.1930 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 6.1931 $as_echo_n "checking for suffix of object files... " >&6; } 6.1932 -if test "${ac_cv_objext+set}" = set; then : 6.1933 +if ${ac_cv_objext+:} false; then : 6.1934 $as_echo_n "(cached) " >&6 6.1935 else 6.1936 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.1937 @@ -20499,7 +20531,7 @@ 6.1938 ac_objext=$OBJEXT 6.1939 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 6.1940 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 6.1941 -if test "${ac_cv_c_compiler_gnu+set}" = set; then : 6.1942 +if ${ac_cv_c_compiler_gnu+:} false; then : 6.1943 $as_echo_n "(cached) " >&6 6.1944 else 6.1945 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.1946 @@ -20536,7 +20568,7 @@ 6.1947 ac_save_CFLAGS=$CFLAGS 6.1948 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 6.1949 $as_echo_n "checking whether $CC accepts -g... " >&6; } 6.1950 -if test "${ac_cv_prog_cc_g+set}" = set; then : 6.1951 +if ${ac_cv_prog_cc_g+:} false; then : 6.1952 $as_echo_n "(cached) " >&6 6.1953 else 6.1954 ac_save_c_werror_flag=$ac_c_werror_flag 6.1955 @@ -20614,7 +20646,7 @@ 6.1956 fi 6.1957 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 6.1958 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 6.1959 -if test "${ac_cv_prog_cc_c89+set}" = set; then : 6.1960 +if ${ac_cv_prog_cc_c89+:} false; then : 6.1961 $as_echo_n "(cached) " >&6 6.1962 else 6.1963 ac_cv_prog_cc_c89=no 6.1964 @@ -20623,8 +20655,7 @@ 6.1965 /* end confdefs.h. */ 6.1966 #include <stdarg.h> 6.1967 #include <stdio.h> 6.1968 -#include <sys/types.h> 6.1969 -#include <sys/stat.h> 6.1970 +struct stat; 6.1971 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ 6.1972 struct buf { int x; }; 6.1973 FILE * (*rcsopen) (struct buf *, struct stat *, int); 6.1974 @@ -20737,7 +20768,7 @@ 6.1975 set dummy $ac_prog; ac_word=$2 6.1976 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1977 $as_echo_n "checking for $ac_word... " >&6; } 6.1978 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 6.1979 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 6.1980 $as_echo_n "(cached) " >&6 6.1981 else 6.1982 case $TOOLS_DIR_CXX in 6.1983 @@ -20751,7 +20782,7 @@ 6.1984 IFS=$as_save_IFS 6.1985 test -z "$as_dir" && as_dir=. 6.1986 for ac_exec_ext in '' $ac_executable_extensions; do 6.1987 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.1988 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.1989 ac_cv_path_TOOLS_DIR_CXX="$as_dir/$ac_word$ac_exec_ext" 6.1990 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.1991 break 2 6.1992 @@ -20789,7 +20820,7 @@ 6.1993 set dummy $ac_prog; ac_word=$2 6.1994 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.1995 $as_echo_n "checking for $ac_word... " >&6; } 6.1996 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 6.1997 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 6.1998 $as_echo_n "(cached) " >&6 6.1999 else 6.2000 case $POTENTIAL_CXX in 6.2001 @@ -20803,7 +20834,7 @@ 6.2002 IFS=$as_save_IFS 6.2003 test -z "$as_dir" && as_dir=. 6.2004 for ac_exec_ext in '' $ac_executable_extensions; do 6.2005 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2006 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2007 ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext" 6.2008 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2009 break 2 6.2010 @@ -21202,7 +21233,7 @@ 6.2011 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.2012 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2013 $as_echo_n "checking for $ac_word... " >&6; } 6.2014 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 6.2015 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 6.2016 $as_echo_n "(cached) " >&6 6.2017 else 6.2018 if test -n "$PROPER_COMPILER_CXX"; then 6.2019 @@ -21214,7 +21245,7 @@ 6.2020 IFS=$as_save_IFS 6.2021 test -z "$as_dir" && as_dir=. 6.2022 for ac_exec_ext in '' $ac_executable_extensions; do 6.2023 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2024 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2025 ac_cv_prog_PROPER_COMPILER_CXX="$ac_tool_prefix$ac_prog" 6.2026 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2027 break 2 6.2028 @@ -21246,7 +21277,7 @@ 6.2029 set dummy $ac_prog; ac_word=$2 6.2030 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2031 $as_echo_n "checking for $ac_word... " >&6; } 6.2032 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 6.2033 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 6.2034 $as_echo_n "(cached) " >&6 6.2035 else 6.2036 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 6.2037 @@ -21258,7 +21289,7 @@ 6.2038 IFS=$as_save_IFS 6.2039 test -z "$as_dir" && as_dir=. 6.2040 for ac_exec_ext in '' $ac_executable_extensions; do 6.2041 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2042 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2043 ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_prog" 6.2044 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2045 break 2 6.2046 @@ -21700,7 +21731,7 @@ 6.2047 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.2048 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2049 $as_echo_n "checking for $ac_word... " >&6; } 6.2050 -if test "${ac_cv_prog_CXX+set}" = set; then : 6.2051 +if ${ac_cv_prog_CXX+:} false; then : 6.2052 $as_echo_n "(cached) " >&6 6.2053 else 6.2054 if test -n "$CXX"; then 6.2055 @@ -21712,7 +21743,7 @@ 6.2056 IFS=$as_save_IFS 6.2057 test -z "$as_dir" && as_dir=. 6.2058 for ac_exec_ext in '' $ac_executable_extensions; do 6.2059 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2060 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2061 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 6.2062 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2063 break 2 6.2064 @@ -21744,7 +21775,7 @@ 6.2065 set dummy $ac_prog; ac_word=$2 6.2066 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2067 $as_echo_n "checking for $ac_word... " >&6; } 6.2068 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 6.2069 +if ${ac_cv_prog_ac_ct_CXX+:} false; then : 6.2070 $as_echo_n "(cached) " >&6 6.2071 else 6.2072 if test -n "$ac_ct_CXX"; then 6.2073 @@ -21756,7 +21787,7 @@ 6.2074 IFS=$as_save_IFS 6.2075 test -z "$as_dir" && as_dir=. 6.2076 for ac_exec_ext in '' $ac_executable_extensions; do 6.2077 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2078 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2079 ac_cv_prog_ac_ct_CXX="$ac_prog" 6.2080 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2081 break 2 6.2082 @@ -21822,7 +21853,7 @@ 6.2083 6.2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 6.2085 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 6.2086 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 6.2087 +if ${ac_cv_cxx_compiler_gnu+:} false; then : 6.2088 $as_echo_n "(cached) " >&6 6.2089 else 6.2090 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.2091 @@ -21859,7 +21890,7 @@ 6.2092 ac_save_CXXFLAGS=$CXXFLAGS 6.2093 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 6.2094 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 6.2095 -if test "${ac_cv_prog_cxx_g+set}" = set; then : 6.2096 +if ${ac_cv_prog_cxx_g+:} false; then : 6.2097 $as_echo_n "(cached) " >&6 6.2098 else 6.2099 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 6.2100 @@ -21957,7 +21988,7 @@ 6.2101 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.2102 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2103 $as_echo_n "checking for $ac_word... " >&6; } 6.2104 -if test "${ac_cv_prog_OBJC+set}" = set; then : 6.2105 +if ${ac_cv_prog_OBJC+:} false; then : 6.2106 $as_echo_n "(cached) " >&6 6.2107 else 6.2108 if test -n "$OBJC"; then 6.2109 @@ -21969,7 +22000,7 @@ 6.2110 IFS=$as_save_IFS 6.2111 test -z "$as_dir" && as_dir=. 6.2112 for ac_exec_ext in '' $ac_executable_extensions; do 6.2113 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2114 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2115 ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog" 6.2116 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2117 break 2 6.2118 @@ -22001,7 +22032,7 @@ 6.2119 set dummy $ac_prog; ac_word=$2 6.2120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2121 $as_echo_n "checking for $ac_word... " >&6; } 6.2122 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 6.2123 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 6.2124 $as_echo_n "(cached) " >&6 6.2125 else 6.2126 if test -n "$ac_ct_OBJC"; then 6.2127 @@ -22013,7 +22044,7 @@ 6.2128 IFS=$as_save_IFS 6.2129 test -z "$as_dir" && as_dir=. 6.2130 for ac_exec_ext in '' $ac_executable_extensions; do 6.2131 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2132 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2133 ac_cv_prog_ac_ct_OBJC="$ac_prog" 6.2134 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2135 break 2 6.2136 @@ -22077,7 +22108,7 @@ 6.2137 6.2138 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 6.2139 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 6.2140 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 6.2141 +if ${ac_cv_objc_compiler_gnu+:} false; then : 6.2142 $as_echo_n "(cached) " >&6 6.2143 else 6.2144 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.2145 @@ -22114,7 +22145,7 @@ 6.2146 ac_save_OBJCFLAGS=$OBJCFLAGS 6.2147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 6.2148 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 6.2149 -if test "${ac_cv_prog_objc_g+set}" = set; then : 6.2150 +if ${ac_cv_prog_objc_g+:} false; then : 6.2151 $as_echo_n "(cached) " >&6 6.2152 else 6.2153 ac_save_objc_werror_flag=$ac_objc_werror_flag 6.2154 @@ -22490,7 +22521,7 @@ 6.2155 set dummy ${ac_tool_prefix}ar; ac_word=$2 6.2156 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2157 $as_echo_n "checking for $ac_word... " >&6; } 6.2158 -if test "${ac_cv_prog_AR+set}" = set; then : 6.2159 +if ${ac_cv_prog_AR+:} false; then : 6.2160 $as_echo_n "(cached) " >&6 6.2161 else 6.2162 if test -n "$AR"; then 6.2163 @@ -22502,7 +22533,7 @@ 6.2164 IFS=$as_save_IFS 6.2165 test -z "$as_dir" && as_dir=. 6.2166 for ac_exec_ext in '' $ac_executable_extensions; do 6.2167 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2168 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2169 ac_cv_prog_AR="${ac_tool_prefix}ar" 6.2170 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2171 break 2 6.2172 @@ -22530,7 +22561,7 @@ 6.2173 set dummy ar; ac_word=$2 6.2174 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2175 $as_echo_n "checking for $ac_word... " >&6; } 6.2176 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 6.2177 +if ${ac_cv_prog_ac_ct_AR+:} false; then : 6.2178 $as_echo_n "(cached) " >&6 6.2179 else 6.2180 if test -n "$ac_ct_AR"; then 6.2181 @@ -22542,7 +22573,7 @@ 6.2182 IFS=$as_save_IFS 6.2183 test -z "$as_dir" && as_dir=. 6.2184 for ac_exec_ext in '' $ac_executable_extensions; do 6.2185 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2186 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2187 ac_cv_prog_ac_ct_AR="ar" 6.2188 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2189 break 2 6.2190 @@ -22872,7 +22903,7 @@ 6.2191 set dummy link; ac_word=$2 6.2192 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2193 $as_echo_n "checking for $ac_word... " >&6; } 6.2194 -if test "${ac_cv_prog_WINLD+set}" = set; then : 6.2195 +if ${ac_cv_prog_WINLD+:} false; then : 6.2196 $as_echo_n "(cached) " >&6 6.2197 else 6.2198 if test -n "$WINLD"; then 6.2199 @@ -22885,7 +22916,7 @@ 6.2200 IFS=$as_save_IFS 6.2201 test -z "$as_dir" && as_dir=. 6.2202 for ac_exec_ext in '' $ac_executable_extensions; do 6.2203 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2204 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2205 if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then 6.2206 ac_prog_rejected=yes 6.2207 continue 6.2208 @@ -23211,7 +23242,7 @@ 6.2209 set dummy mt; ac_word=$2 6.2210 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2211 $as_echo_n "checking for $ac_word... " >&6; } 6.2212 -if test "${ac_cv_prog_MT+set}" = set; then : 6.2213 +if ${ac_cv_prog_MT+:} false; then : 6.2214 $as_echo_n "(cached) " >&6 6.2215 else 6.2216 if test -n "$MT"; then 6.2217 @@ -23224,7 +23255,7 @@ 6.2218 IFS=$as_save_IFS 6.2219 test -z "$as_dir" && as_dir=. 6.2220 for ac_exec_ext in '' $ac_executable_extensions; do 6.2221 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2222 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2223 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then 6.2224 ac_prog_rejected=yes 6.2225 continue 6.2226 @@ -23532,7 +23563,7 @@ 6.2227 set dummy rc; ac_word=$2 6.2228 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2229 $as_echo_n "checking for $ac_word... " >&6; } 6.2230 -if test "${ac_cv_prog_RC+set}" = set; then : 6.2231 +if ${ac_cv_prog_RC+:} false; then : 6.2232 $as_echo_n "(cached) " >&6 6.2233 else 6.2234 if test -n "$RC"; then 6.2235 @@ -23545,7 +23576,7 @@ 6.2236 IFS=$as_save_IFS 6.2237 test -z "$as_dir" && as_dir=. 6.2238 for ac_exec_ext in '' $ac_executable_extensions; do 6.2239 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2240 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2241 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then 6.2242 ac_prog_rejected=yes 6.2243 continue 6.2244 @@ -23924,7 +23955,7 @@ 6.2245 set dummy lib; ac_word=$2 6.2246 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2247 $as_echo_n "checking for $ac_word... " >&6; } 6.2248 -if test "${ac_cv_prog_WINAR+set}" = set; then : 6.2249 +if ${ac_cv_prog_WINAR+:} false; then : 6.2250 $as_echo_n "(cached) " >&6 6.2251 else 6.2252 if test -n "$WINAR"; then 6.2253 @@ -23936,7 +23967,7 @@ 6.2254 IFS=$as_save_IFS 6.2255 test -z "$as_dir" && as_dir=. 6.2256 for ac_exec_ext in '' $ac_executable_extensions; do 6.2257 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2258 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2259 ac_cv_prog_WINAR="lib" 6.2260 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2261 break 2 6.2262 @@ -24230,7 +24261,7 @@ 6.2263 set dummy dumpbin; ac_word=$2 6.2264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2265 $as_echo_n "checking for $ac_word... " >&6; } 6.2266 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 6.2267 +if ${ac_cv_prog_DUMPBIN+:} false; then : 6.2268 $as_echo_n "(cached) " >&6 6.2269 else 6.2270 if test -n "$DUMPBIN"; then 6.2271 @@ -24242,7 +24273,7 @@ 6.2272 IFS=$as_save_IFS 6.2273 test -z "$as_dir" && as_dir=. 6.2274 for ac_exec_ext in '' $ac_executable_extensions; do 6.2275 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2276 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2277 ac_cv_prog_DUMPBIN="dumpbin" 6.2278 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2279 break 2 6.2280 @@ -24549,7 +24580,7 @@ 6.2281 CPP= 6.2282 fi 6.2283 if test -z "$CPP"; then 6.2284 - if test "${ac_cv_prog_CPP+set}" = set; then : 6.2285 + if ${ac_cv_prog_CPP+:} false; then : 6.2286 $as_echo_n "(cached) " >&6 6.2287 else 6.2288 # Double quotes because CPP needs to be expanded 6.2289 @@ -24949,7 +24980,7 @@ 6.2290 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 6.2291 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 6.2292 if test -z "$CXXCPP"; then 6.2293 - if test "${ac_cv_prog_CXXCPP+set}" = set; then : 6.2294 + if ${ac_cv_prog_CXXCPP+:} false; then : 6.2295 $as_echo_n "(cached) " >&6 6.2296 else 6.2297 # Double quotes because CXXCPP needs to be expanded 6.2298 @@ -25367,7 +25398,7 @@ 6.2299 set dummy as; ac_word=$2 6.2300 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2301 $as_echo_n "checking for $ac_word... " >&6; } 6.2302 -if test "${ac_cv_path_AS+set}" = set; then : 6.2303 +if ${ac_cv_path_AS+:} false; then : 6.2304 $as_echo_n "(cached) " >&6 6.2305 else 6.2306 case $AS in 6.2307 @@ -25381,7 +25412,7 @@ 6.2308 IFS=$as_save_IFS 6.2309 test -z "$as_dir" && as_dir=. 6.2310 for ac_exec_ext in '' $ac_executable_extensions; do 6.2311 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2312 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2313 ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext" 6.2314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2315 break 2 6.2316 @@ -25679,7 +25710,7 @@ 6.2317 set dummy nm; ac_word=$2 6.2318 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2319 $as_echo_n "checking for $ac_word... " >&6; } 6.2320 -if test "${ac_cv_path_NM+set}" = set; then : 6.2321 +if ${ac_cv_path_NM+:} false; then : 6.2322 $as_echo_n "(cached) " >&6 6.2323 else 6.2324 case $NM in 6.2325 @@ -25693,7 +25724,7 @@ 6.2326 IFS=$as_save_IFS 6.2327 test -z "$as_dir" && as_dir=. 6.2328 for ac_exec_ext in '' $ac_executable_extensions; do 6.2329 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2330 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2331 ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" 6.2332 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2333 break 2 6.2334 @@ -25985,7 +26016,7 @@ 6.2335 set dummy gnm; ac_word=$2 6.2336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2337 $as_echo_n "checking for $ac_word... " >&6; } 6.2338 -if test "${ac_cv_path_GNM+set}" = set; then : 6.2339 +if ${ac_cv_path_GNM+:} false; then : 6.2340 $as_echo_n "(cached) " >&6 6.2341 else 6.2342 case $GNM in 6.2343 @@ -25999,7 +26030,7 @@ 6.2344 IFS=$as_save_IFS 6.2345 test -z "$as_dir" && as_dir=. 6.2346 for ac_exec_ext in '' $ac_executable_extensions; do 6.2347 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2348 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2349 ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext" 6.2350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2351 break 2 6.2352 @@ -26291,7 +26322,7 @@ 6.2353 set dummy strip; ac_word=$2 6.2354 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2355 $as_echo_n "checking for $ac_word... " >&6; } 6.2356 -if test "${ac_cv_path_STRIP+set}" = set; then : 6.2357 +if ${ac_cv_path_STRIP+:} false; then : 6.2358 $as_echo_n "(cached) " >&6 6.2359 else 6.2360 case $STRIP in 6.2361 @@ -26305,7 +26336,7 @@ 6.2362 IFS=$as_save_IFS 6.2363 test -z "$as_dir" && as_dir=. 6.2364 for ac_exec_ext in '' $ac_executable_extensions; do 6.2365 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2366 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2367 ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" 6.2368 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2369 break 2 6.2370 @@ -26597,7 +26628,7 @@ 6.2371 set dummy mcs; ac_word=$2 6.2372 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2373 $as_echo_n "checking for $ac_word... " >&6; } 6.2374 -if test "${ac_cv_path_MCS+set}" = set; then : 6.2375 +if ${ac_cv_path_MCS+:} false; then : 6.2376 $as_echo_n "(cached) " >&6 6.2377 else 6.2378 case $MCS in 6.2379 @@ -26611,7 +26642,7 @@ 6.2380 IFS=$as_save_IFS 6.2381 test -z "$as_dir" && as_dir=. 6.2382 for ac_exec_ext in '' $ac_executable_extensions; do 6.2383 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2384 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2385 ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext" 6.2386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2387 break 2 6.2388 @@ -26905,7 +26936,7 @@ 6.2389 set dummy ${ac_tool_prefix}nm; ac_word=$2 6.2390 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2391 $as_echo_n "checking for $ac_word... " >&6; } 6.2392 -if test "${ac_cv_prog_NM+set}" = set; then : 6.2393 +if ${ac_cv_prog_NM+:} false; then : 6.2394 $as_echo_n "(cached) " >&6 6.2395 else 6.2396 if test -n "$NM"; then 6.2397 @@ -26917,7 +26948,7 @@ 6.2398 IFS=$as_save_IFS 6.2399 test -z "$as_dir" && as_dir=. 6.2400 for ac_exec_ext in '' $ac_executable_extensions; do 6.2401 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2402 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2403 ac_cv_prog_NM="${ac_tool_prefix}nm" 6.2404 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2405 break 2 6.2406 @@ -26945,7 +26976,7 @@ 6.2407 set dummy nm; ac_word=$2 6.2408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2409 $as_echo_n "checking for $ac_word... " >&6; } 6.2410 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 6.2411 +if ${ac_cv_prog_ac_ct_NM+:} false; then : 6.2412 $as_echo_n "(cached) " >&6 6.2413 else 6.2414 if test -n "$ac_ct_NM"; then 6.2415 @@ -26957,7 +26988,7 @@ 6.2416 IFS=$as_save_IFS 6.2417 test -z "$as_dir" && as_dir=. 6.2418 for ac_exec_ext in '' $ac_executable_extensions; do 6.2419 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2420 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2421 ac_cv_prog_ac_ct_NM="nm" 6.2422 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2423 break 2 6.2424 @@ -27265,7 +27296,7 @@ 6.2425 set dummy ${ac_tool_prefix}strip; ac_word=$2 6.2426 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2427 $as_echo_n "checking for $ac_word... " >&6; } 6.2428 -if test "${ac_cv_prog_STRIP+set}" = set; then : 6.2429 +if ${ac_cv_prog_STRIP+:} false; then : 6.2430 $as_echo_n "(cached) " >&6 6.2431 else 6.2432 if test -n "$STRIP"; then 6.2433 @@ -27277,7 +27308,7 @@ 6.2434 IFS=$as_save_IFS 6.2435 test -z "$as_dir" && as_dir=. 6.2436 for ac_exec_ext in '' $ac_executable_extensions; do 6.2437 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2438 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2439 ac_cv_prog_STRIP="${ac_tool_prefix}strip" 6.2440 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2441 break 2 6.2442 @@ -27305,7 +27336,7 @@ 6.2443 set dummy strip; ac_word=$2 6.2444 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2445 $as_echo_n "checking for $ac_word... " >&6; } 6.2446 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 6.2447 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 6.2448 $as_echo_n "(cached) " >&6 6.2449 else 6.2450 if test -n "$ac_ct_STRIP"; then 6.2451 @@ -27317,7 +27348,7 @@ 6.2452 IFS=$as_save_IFS 6.2453 test -z "$as_dir" && as_dir=. 6.2454 for ac_exec_ext in '' $ac_executable_extensions; do 6.2455 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2456 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2457 ac_cv_prog_ac_ct_STRIP="strip" 6.2458 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2459 break 2 6.2460 @@ -27630,7 +27661,7 @@ 6.2461 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.2462 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2463 $as_echo_n "checking for $ac_word... " >&6; } 6.2464 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 6.2465 +if ${ac_cv_prog_OBJCOPY+:} false; then : 6.2466 $as_echo_n "(cached) " >&6 6.2467 else 6.2468 if test -n "$OBJCOPY"; then 6.2469 @@ -27642,7 +27673,7 @@ 6.2470 IFS=$as_save_IFS 6.2471 test -z "$as_dir" && as_dir=. 6.2472 for ac_exec_ext in '' $ac_executable_extensions; do 6.2473 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2474 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2475 ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog" 6.2476 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2477 break 2 6.2478 @@ -27674,7 +27705,7 @@ 6.2479 set dummy $ac_prog; ac_word=$2 6.2480 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2481 $as_echo_n "checking for $ac_word... " >&6; } 6.2482 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 6.2483 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 6.2484 $as_echo_n "(cached) " >&6 6.2485 else 6.2486 if test -n "$ac_ct_OBJCOPY"; then 6.2487 @@ -27686,7 +27717,7 @@ 6.2488 IFS=$as_save_IFS 6.2489 test -z "$as_dir" && as_dir=. 6.2490 for ac_exec_ext in '' $ac_executable_extensions; do 6.2491 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2492 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2493 ac_cv_prog_ac_ct_OBJCOPY="$ac_prog" 6.2494 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2495 break 2 6.2496 @@ -28001,7 +28032,7 @@ 6.2497 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6.2498 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2499 $as_echo_n "checking for $ac_word... " >&6; } 6.2500 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 6.2501 +if ${ac_cv_prog_OBJDUMP+:} false; then : 6.2502 $as_echo_n "(cached) " >&6 6.2503 else 6.2504 if test -n "$OBJDUMP"; then 6.2505 @@ -28013,7 +28044,7 @@ 6.2506 IFS=$as_save_IFS 6.2507 test -z "$as_dir" && as_dir=. 6.2508 for ac_exec_ext in '' $ac_executable_extensions; do 6.2509 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2510 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2511 ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog" 6.2512 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2513 break 2 6.2514 @@ -28045,7 +28076,7 @@ 6.2515 set dummy $ac_prog; ac_word=$2 6.2516 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2517 $as_echo_n "checking for $ac_word... " >&6; } 6.2518 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 6.2519 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 6.2520 $as_echo_n "(cached) " >&6 6.2521 else 6.2522 if test -n "$ac_ct_OBJDUMP"; then 6.2523 @@ -28057,7 +28088,7 @@ 6.2524 IFS=$as_save_IFS 6.2525 test -z "$as_dir" && as_dir=. 6.2526 for ac_exec_ext in '' $ac_executable_extensions; do 6.2527 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2528 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2529 ac_cv_prog_ac_ct_OBJDUMP="$ac_prog" 6.2530 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2531 break 2 6.2532 @@ -28369,7 +28400,7 @@ 6.2533 set dummy lipo; ac_word=$2 6.2534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2535 $as_echo_n "checking for $ac_word... " >&6; } 6.2536 -if test "${ac_cv_path_LIPO+set}" = set; then : 6.2537 +if ${ac_cv_path_LIPO+:} false; then : 6.2538 $as_echo_n "(cached) " >&6 6.2539 else 6.2540 case $LIPO in 6.2541 @@ -28383,7 +28414,7 @@ 6.2542 IFS=$as_save_IFS 6.2543 test -z "$as_dir" && as_dir=. 6.2544 for ac_exec_ext in '' $ac_executable_extensions; do 6.2545 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2546 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2547 ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext" 6.2548 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2549 break 2 6.2550 @@ -28686,7 +28717,7 @@ 6.2551 6.2552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 6.2553 $as_echo_n "checking for ANSI C header files... " >&6; } 6.2554 -if test "${ac_cv_header_stdc+set}" = set; then : 6.2555 +if ${ac_cv_header_stdc+:} false; then : 6.2556 $as_echo_n "(cached) " >&6 6.2557 else 6.2558 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6.2559 @@ -28826,17 +28857,16 @@ 6.2560 6.2561 # keep track of c/cxx flags that we added outselves... 6.2562 # to prevent emitting warning... 6.2563 - ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.2564 - ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.2565 - ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.2566 - 6.2567 - CFLAGS="${CFLAGS}${ADDED_CFLAGS}" 6.2568 - CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" 6.2569 - LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" 6.2570 - 6.2571 - CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" 6.2572 - CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" 6.2573 - LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" 6.2574 + TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" 6.2575 + 6.2576 + 6.2577 + CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" 6.2578 + CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" 6.2579 + LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" 6.2580 + 6.2581 + CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.2582 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.2583 + LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.2584 6.2585 elif test "x$COMPILE_TYPE" = xreduced; then 6.2586 if test "x$OPENJDK_TARGET_OS" != xwindows; then 6.2587 @@ -28844,17 +28874,16 @@ 6.2588 6.2589 # keep track of c/cxx flags that we added outselves... 6.2590 # to prevent emitting warning... 6.2591 - ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.2592 - ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.2593 - ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 6.2594 - 6.2595 - CFLAGS="${CFLAGS}${ADDED_CFLAGS}" 6.2596 - CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" 6.2597 - LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" 6.2598 - 6.2599 - CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" 6.2600 - CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" 6.2601 - LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" 6.2602 + TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" 6.2603 + 6.2604 + 6.2605 + CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" 6.2606 + CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" 6.2607 + LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" 6.2608 + 6.2609 + CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.2610 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.2611 + LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" 6.2612 6.2613 fi 6.2614 fi 6.2615 @@ -28863,7 +28892,7 @@ 6.2616 for ac_header in stdio.h 6.2617 do : 6.2618 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 6.2619 -if test "x$ac_cv_header_stdio_h" = x""yes; then : 6.2620 +if test "x$ac_cv_header_stdio_h" = xyes; then : 6.2621 cat >>confdefs.h <<_ACEOF 6.2622 #define HAVE_STDIO_H 1 6.2623 _ACEOF 6.2624 @@ -28892,7 +28921,7 @@ 6.2625 # This bug is HP SR number 8606223364. 6.2626 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 6.2627 $as_echo_n "checking size of int *... " >&6; } 6.2628 -if test "${ac_cv_sizeof_int_p+set}" = set; then : 6.2629 +if ${ac_cv_sizeof_int_p+:} false; then : 6.2630 $as_echo_n "(cached) " >&6 6.2631 else 6.2632 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 6.2633 @@ -28949,7 +28978,7 @@ 6.2634 # 6.2635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 6.2636 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 6.2637 -if test "${ac_cv_c_bigendian+set}" = set; then : 6.2638 +if ${ac_cv_c_bigendian+:} false; then : 6.2639 $as_echo_n "(cached) " >&6 6.2640 else 6.2641 ac_cv_c_bigendian=unknown 6.2642 @@ -29623,7 +29652,7 @@ 6.2643 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS" 6.2644 fi 6.2645 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 6.2646 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" 6.2647 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" 6.2648 # Setting these parameters makes it an error to link to macosx APIs that are 6.2649 # newer than the given OS version and makes the linked binaries compatible even 6.2650 # if built on a newer version of the OS. 6.2651 @@ -30147,7 +30176,7 @@ 6.2652 else 6.2653 case $x_includes,$x_libraries in #( 6.2654 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 6.2655 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 6.2656 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 6.2657 $as_echo_n "(cached) " >&6 6.2658 else 6.2659 # One or both of the vars are not set, and there is no cached value. 6.2660 @@ -30424,7 +30453,7 @@ 6.2661 else 6.2662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 6.2663 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 6.2664 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 6.2665 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 6.2666 $as_echo_n "(cached) " >&6 6.2667 else 6.2668 ac_check_lib_save_LIBS=$LIBS 6.2669 @@ -30458,14 +30487,14 @@ 6.2670 fi 6.2671 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 6.2672 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 6.2673 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 6.2674 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 6.2675 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 6.2676 fi 6.2677 6.2678 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 6.2679 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 6.2680 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 6.2681 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 6.2682 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 6.2683 $as_echo_n "(cached) " >&6 6.2684 else 6.2685 ac_check_lib_save_LIBS=$LIBS 6.2686 @@ -30499,7 +30528,7 @@ 6.2687 fi 6.2688 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 6.2689 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 6.2690 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 6.2691 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 6.2692 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 6.2693 fi 6.2694 6.2695 @@ -30518,14 +30547,14 @@ 6.2696 # The functions gethostbyname, getservbyname, and inet_addr are 6.2697 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 6.2698 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 6.2699 -if test "x$ac_cv_func_gethostbyname" = x""yes; then : 6.2700 +if test "x$ac_cv_func_gethostbyname" = xyes; then : 6.2701 6.2702 fi 6.2703 6.2704 if test $ac_cv_func_gethostbyname = no; then 6.2705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 6.2706 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 6.2707 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 6.2708 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 6.2709 $as_echo_n "(cached) " >&6 6.2710 else 6.2711 ac_check_lib_save_LIBS=$LIBS 6.2712 @@ -30559,14 +30588,14 @@ 6.2713 fi 6.2714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 6.2715 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 6.2716 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 6.2717 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 6.2718 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 6.2719 fi 6.2720 6.2721 if test $ac_cv_lib_nsl_gethostbyname = no; then 6.2722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 6.2723 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 6.2724 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 6.2725 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 6.2726 $as_echo_n "(cached) " >&6 6.2727 else 6.2728 ac_check_lib_save_LIBS=$LIBS 6.2729 @@ -30600,7 +30629,7 @@ 6.2730 fi 6.2731 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 6.2732 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 6.2733 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 6.2734 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 6.2735 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 6.2736 fi 6.2737 6.2738 @@ -30615,14 +30644,14 @@ 6.2739 # must be given before -lnsl if both are needed. We assume that 6.2740 # if connect needs -lnsl, so does gethostbyname. 6.2741 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 6.2742 -if test "x$ac_cv_func_connect" = x""yes; then : 6.2743 +if test "x$ac_cv_func_connect" = xyes; then : 6.2744 6.2745 fi 6.2746 6.2747 if test $ac_cv_func_connect = no; then 6.2748 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 6.2749 $as_echo_n "checking for connect in -lsocket... " >&6; } 6.2750 -if test "${ac_cv_lib_socket_connect+set}" = set; then : 6.2751 +if ${ac_cv_lib_socket_connect+:} false; then : 6.2752 $as_echo_n "(cached) " >&6 6.2753 else 6.2754 ac_check_lib_save_LIBS=$LIBS 6.2755 @@ -30656,7 +30685,7 @@ 6.2756 fi 6.2757 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 6.2758 $as_echo "$ac_cv_lib_socket_connect" >&6; } 6.2759 -if test "x$ac_cv_lib_socket_connect" = x""yes; then : 6.2760 +if test "x$ac_cv_lib_socket_connect" = xyes; then : 6.2761 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 6.2762 fi 6.2763 6.2764 @@ -30664,14 +30693,14 @@ 6.2765 6.2766 # Guillermo Gomez says -lposix is necessary on A/UX. 6.2767 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 6.2768 -if test "x$ac_cv_func_remove" = x""yes; then : 6.2769 +if test "x$ac_cv_func_remove" = xyes; then : 6.2770 6.2771 fi 6.2772 6.2773 if test $ac_cv_func_remove = no; then 6.2774 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 6.2775 $as_echo_n "checking for remove in -lposix... " >&6; } 6.2776 -if test "${ac_cv_lib_posix_remove+set}" = set; then : 6.2777 +if ${ac_cv_lib_posix_remove+:} false; then : 6.2778 $as_echo_n "(cached) " >&6 6.2779 else 6.2780 ac_check_lib_save_LIBS=$LIBS 6.2781 @@ -30705,7 +30734,7 @@ 6.2782 fi 6.2783 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 6.2784 $as_echo "$ac_cv_lib_posix_remove" >&6; } 6.2785 -if test "x$ac_cv_lib_posix_remove" = x""yes; then : 6.2786 +if test "x$ac_cv_lib_posix_remove" = xyes; then : 6.2787 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 6.2788 fi 6.2789 6.2790 @@ -30713,14 +30742,14 @@ 6.2791 6.2792 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 6.2793 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 6.2794 -if test "x$ac_cv_func_shmat" = x""yes; then : 6.2795 +if test "x$ac_cv_func_shmat" = xyes; then : 6.2796 6.2797 fi 6.2798 6.2799 if test $ac_cv_func_shmat = no; then 6.2800 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 6.2801 $as_echo_n "checking for shmat in -lipc... " >&6; } 6.2802 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 6.2803 +if ${ac_cv_lib_ipc_shmat+:} false; then : 6.2804 $as_echo_n "(cached) " >&6 6.2805 else 6.2806 ac_check_lib_save_LIBS=$LIBS 6.2807 @@ -30754,7 +30783,7 @@ 6.2808 fi 6.2809 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 6.2810 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 6.2811 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 6.2812 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 6.2813 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 6.2814 fi 6.2815 6.2816 @@ -30772,7 +30801,7 @@ 6.2817 # John Interrante, Karl Berry 6.2818 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 6.2819 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 6.2820 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 6.2821 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 6.2822 $as_echo_n "(cached) " >&6 6.2823 else 6.2824 ac_check_lib_save_LIBS=$LIBS 6.2825 @@ -30806,7 +30835,7 @@ 6.2826 fi 6.2827 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 6.2828 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 6.2829 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 6.2830 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 6.2831 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 6.2832 fi 6.2833 6.2834 @@ -30887,7 +30916,7 @@ 6.2835 CFLAGS="$CFLAGS $X_CFLAGS" 6.2836 6.2837 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10 6.2838 -for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h 6.2839 +for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h 6.2840 do : 6.2841 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 6.2842 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h> 6.2843 @@ -30940,7 +30969,7 @@ 6.2844 HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 6.2845 fi 6.2846 6.2847 - as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG" "$LINENO" 5 6.2848 + as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5 6.2849 fi 6.2850 6.2851 6.2852 @@ -31824,7 +31853,7 @@ 6.2853 LDFLAGS="$FREETYPE2_LIBS" 6.2854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 6.2855 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 6.2856 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 6.2857 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 6.2858 $as_echo_n "(cached) " >&6 6.2859 else 6.2860 ac_check_lib_save_LIBS=$LIBS 6.2861 @@ -31858,7 +31887,7 @@ 6.2862 fi 6.2863 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 6.2864 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 6.2865 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 6.2866 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 6.2867 FREETYPE2_FOUND=true 6.2868 else 6.2869 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 6.2870 @@ -32146,7 +32175,7 @@ 6.2871 for ac_header in alsa/asoundlib.h 6.2872 do : 6.2873 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 6.2874 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 6.2875 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 6.2876 cat >>confdefs.h <<_ACEOF 6.2877 #define HAVE_ALSA_ASOUNDLIB_H 1 6.2878 _ACEOF 6.2879 @@ -32205,7 +32234,7 @@ 6.2880 USE_EXTERNAL_LIBJPEG=true 6.2881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 6.2882 $as_echo_n "checking for main in -ljpeg... " >&6; } 6.2883 -if test "${ac_cv_lib_jpeg_main+set}" = set; then : 6.2884 +if ${ac_cv_lib_jpeg_main+:} false; then : 6.2885 $as_echo_n "(cached) " >&6 6.2886 else 6.2887 ac_check_lib_save_LIBS=$LIBS 6.2888 @@ -32233,7 +32262,7 @@ 6.2889 fi 6.2890 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 6.2891 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 6.2892 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 6.2893 +if test "x$ac_cv_lib_jpeg_main" = xyes; then : 6.2894 cat >>confdefs.h <<_ACEOF 6.2895 #define HAVE_LIBJPEG 1 6.2896 _ACEOF 6.2897 @@ -32282,7 +32311,7 @@ 6.2898 USE_EXTERNAL_LIBGIF=false 6.2899 elif test "x${with_giflib}" = "xsystem"; then 6.2900 ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" 6.2901 -if test "x$ac_cv_header_gif_lib_h" = x""yes; then : 6.2902 +if test "x$ac_cv_header_gif_lib_h" = xyes; then : 6.2903 6.2904 else 6.2905 as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5 6.2906 @@ -32291,7 +32320,7 @@ 6.2907 6.2908 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 6.2909 $as_echo_n "checking for DGifGetCode in -lgif... " >&6; } 6.2910 -if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then : 6.2911 +if ${ac_cv_lib_gif_DGifGetCode+:} false; then : 6.2912 $as_echo_n "(cached) " >&6 6.2913 else 6.2914 ac_check_lib_save_LIBS=$LIBS 6.2915 @@ -32325,7 +32354,7 @@ 6.2916 fi 6.2917 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 6.2918 $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } 6.2919 -if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then : 6.2920 +if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : 6.2921 cat >>confdefs.h <<_ACEOF 6.2922 #define HAVE_LIBGIF 1 6.2923 _ACEOF 6.2924 @@ -32357,7 +32386,7 @@ 6.2925 6.2926 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 6.2927 $as_echo_n "checking for compress in -lz... " >&6; } 6.2928 -if test "${ac_cv_lib_z_compress+set}" = set; then : 6.2929 +if ${ac_cv_lib_z_compress+:} false; then : 6.2930 $as_echo_n "(cached) " >&6 6.2931 else 6.2932 ac_check_lib_save_LIBS=$LIBS 6.2933 @@ -32391,7 +32420,7 @@ 6.2934 fi 6.2935 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 6.2936 $as_echo "$ac_cv_lib_z_compress" >&6; } 6.2937 -if test "x$ac_cv_lib_z_compress" = x""yes; then : 6.2938 +if test "x$ac_cv_lib_z_compress" = xyes; then : 6.2939 ZLIB_FOUND=yes 6.2940 else 6.2941 ZLIB_FOUND=no 6.2942 @@ -32484,7 +32513,7 @@ 6.2943 6.2944 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 6.2945 $as_echo_n "checking for cos in -lm... " >&6; } 6.2946 -if test "${ac_cv_lib_m_cos+set}" = set; then : 6.2947 +if ${ac_cv_lib_m_cos+:} false; then : 6.2948 $as_echo_n "(cached) " >&6 6.2949 else 6.2950 ac_check_lib_save_LIBS=$LIBS 6.2951 @@ -32518,7 +32547,7 @@ 6.2952 fi 6.2953 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 6.2954 $as_echo "$ac_cv_lib_m_cos" >&6; } 6.2955 -if test "x$ac_cv_lib_m_cos" = x""yes; then : 6.2956 +if test "x$ac_cv_lib_m_cos" = xyes; then : 6.2957 cat >>confdefs.h <<_ACEOF 6.2958 #define HAVE_LIBM 1 6.2959 _ACEOF 6.2960 @@ -32542,7 +32571,7 @@ 6.2961 LIBS="" 6.2962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 6.2963 $as_echo_n "checking for dlopen in -ldl... " >&6; } 6.2964 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 6.2965 +if ${ac_cv_lib_dl_dlopen+:} false; then : 6.2966 $as_echo_n "(cached) " >&6 6.2967 else 6.2968 ac_check_lib_save_LIBS=$LIBS 6.2969 @@ -32576,7 +32605,7 @@ 6.2970 fi 6.2971 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 6.2972 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 6.2973 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 6.2974 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 6.2975 cat >>confdefs.h <<_ACEOF 6.2976 #define HAVE_LIBDL 1 6.2977 _ACEOF 6.2978 @@ -32822,7 +32851,7 @@ 6.2979 set dummy llvm-config; ac_word=$2 6.2980 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2981 $as_echo_n "checking for $ac_word... " >&6; } 6.2982 -if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then : 6.2983 +if ${ac_cv_prog_LLVM_CONFIG+:} false; then : 6.2984 $as_echo_n "(cached) " >&6 6.2985 else 6.2986 if test -n "$LLVM_CONFIG"; then 6.2987 @@ -32834,7 +32863,7 @@ 6.2988 IFS=$as_save_IFS 6.2989 test -z "$as_dir" && as_dir=. 6.2990 for ac_exec_ext in '' $ac_executable_extensions; do 6.2991 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.2992 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.2993 ac_cv_prog_LLVM_CONFIG="llvm-config" 6.2994 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.2995 break 2 6.2996 @@ -33438,7 +33467,7 @@ 6.2997 set dummy ccache; ac_word=$2 6.2998 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6.2999 $as_echo_n "checking for $ac_word... " >&6; } 6.3000 -if test "${ac_cv_path_CCACHE+set}" = set; then : 6.3001 +if ${ac_cv_path_CCACHE+:} false; then : 6.3002 $as_echo_n "(cached) " >&6 6.3003 else 6.3004 case $CCACHE in 6.3005 @@ -33452,7 +33481,7 @@ 6.3006 IFS=$as_save_IFS 6.3007 test -z "$as_dir" && as_dir=. 6.3008 for ac_exec_ext in '' $ac_executable_extensions; do 6.3009 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6.3010 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6.3011 ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext" 6.3012 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6.3013 break 2 6.3014 @@ -33700,10 +33729,21 @@ 6.3015 :end' >>confcache 6.3016 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 6.3017 if test -w "$cache_file"; then 6.3018 - test "x$cache_file" != "x/dev/null" && 6.3019 + if test "x$cache_file" != "x/dev/null"; then 6.3020 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 6.3021 $as_echo "$as_me: updating cache $cache_file" >&6;} 6.3022 - cat confcache >$cache_file 6.3023 + if test ! -f "$cache_file" || test -h "$cache_file"; then 6.3024 + cat confcache >"$cache_file" 6.3025 + else 6.3026 + case $cache_file in #( 6.3027 + */* | ?:*) 6.3028 + mv -f confcache "$cache_file"$$ && 6.3029 + mv -f "$cache_file"$$ "$cache_file" ;; #( 6.3030 + *) 6.3031 + mv -f confcache "$cache_file" ;; 6.3032 + esac 6.3033 + fi 6.3034 + fi 6.3035 else 6.3036 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 6.3037 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 6.3038 @@ -33735,7 +33775,7 @@ 6.3039 6.3040 6.3041 6.3042 -: ${CONFIG_STATUS=./config.status} 6.3043 +: "${CONFIG_STATUS=./config.status}" 6.3044 ac_write_fail=0 6.3045 ac_clean_files_save=$ac_clean_files 6.3046 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 6.3047 @@ -33836,6 +33876,7 @@ 6.3048 IFS=" "" $as_nl" 6.3049 6.3050 # Find who we are. Look in the path if we contain no directory separator. 6.3051 +as_myself= 6.3052 case $0 in #(( 6.3053 *[\\/]* ) as_myself=$0 ;; 6.3054 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6.3055 @@ -34031,16 +34072,16 @@ 6.3056 # ... but there are two gotchas: 6.3057 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 6.3058 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 6.3059 - # In both cases, we have to default to `cp -p'. 6.3060 + # In both cases, we have to default to `cp -pR'. 6.3061 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 6.3062 - as_ln_s='cp -p' 6.3063 + as_ln_s='cp -pR' 6.3064 elif ln conf$$.file conf$$ 2>/dev/null; then 6.3065 as_ln_s=ln 6.3066 else 6.3067 - as_ln_s='cp -p' 6.3068 - fi 6.3069 -else 6.3070 - as_ln_s='cp -p' 6.3071 + as_ln_s='cp -pR' 6.3072 + fi 6.3073 +else 6.3074 + as_ln_s='cp -pR' 6.3075 fi 6.3076 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 6.3077 rmdir conf$$.dir 2>/dev/null 6.3078 @@ -34100,28 +34141,16 @@ 6.3079 as_mkdir_p=false 6.3080 fi 6.3081 6.3082 -if test -x / >/dev/null 2>&1; then 6.3083 - as_test_x='test -x' 6.3084 -else 6.3085 - if ls -dL / >/dev/null 2>&1; then 6.3086 - as_ls_L_option=L 6.3087 - else 6.3088 - as_ls_L_option= 6.3089 - fi 6.3090 - as_test_x=' 6.3091 - eval sh -c '\'' 6.3092 - if test -d "$1"; then 6.3093 - test -d "$1/."; 6.3094 - else 6.3095 - case $1 in #( 6.3096 - -*)set "./$1";; 6.3097 - esac; 6.3098 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 6.3099 - ???[sx]*):;;*)false;;esac;fi 6.3100 - '\'' sh 6.3101 - ' 6.3102 -fi 6.3103 -as_executable_p=$as_test_x 6.3104 + 6.3105 +# as_fn_executable_p FILE 6.3106 +# ----------------------- 6.3107 +# Test if FILE is an executable regular file. 6.3108 +as_fn_executable_p () 6.3109 +{ 6.3110 + test -f "$1" && test -x "$1" 6.3111 +} # as_fn_executable_p 6.3112 +as_test_x='test -x' 6.3113 +as_executable_p=as_fn_executable_p 6.3114 6.3115 # Sed expression to map a string onto a valid CPP name. 6.3116 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 6.3117 @@ -34143,7 +34172,7 @@ 6.3118 # values after options handling. 6.3119 ac_log=" 6.3120 This file was extended by OpenJDK $as_me jdk8, which was 6.3121 -generated by GNU Autoconf 2.67. Invocation command line was 6.3122 +generated by GNU Autoconf 2.69. Invocation command line was 6.3123 6.3124 CONFIG_FILES = $CONFIG_FILES 6.3125 CONFIG_HEADERS = $CONFIG_HEADERS 6.3126 @@ -34206,10 +34235,10 @@ 6.3127 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 6.3128 ac_cs_version="\\ 6.3129 OpenJDK config.status jdk8 6.3130 -configured by $0, generated by GNU Autoconf 2.67, 6.3131 +configured by $0, generated by GNU Autoconf 2.69, 6.3132 with options \\"\$ac_cs_config\\" 6.3133 6.3134 -Copyright (C) 2010 Free Software Foundation, Inc. 6.3135 +Copyright (C) 2012 Free Software Foundation, Inc. 6.3136 This config.status script is free software; the Free Software Foundation 6.3137 gives unlimited permission to copy, distribute and modify it." 6.3138 6.3139 @@ -34298,7 +34327,7 @@ 6.3140 _ACEOF 6.3141 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 6.3142 if \$ac_cs_recheck; then 6.3143 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 6.3144 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 6.3145 shift 6.3146 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 6.3147 CONFIG_SHELL='$SHELL' 6.3148 @@ -34357,9 +34386,10 @@ 6.3149 # after its creation but before its name has been assigned to `$tmp'. 6.3150 $debug || 6.3151 { 6.3152 - tmp= 6.3153 + tmp= ac_tmp= 6.3154 trap 'exit_status=$? 6.3155 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 6.3156 + : "${ac_tmp:=$tmp}" 6.3157 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 6.3158 ' 0 6.3159 trap 'as_fn_exit 1' 1 2 13 15 6.3160 } 6.3161 @@ -34367,12 +34397,13 @@ 6.3162 6.3163 { 6.3164 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 6.3165 - test -n "$tmp" && test -d "$tmp" 6.3166 + test -d "$tmp" 6.3167 } || 6.3168 { 6.3169 tmp=./conf$$-$RANDOM 6.3170 (umask 077 && mkdir "$tmp") 6.3171 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 6.3172 +ac_tmp=$tmp 6.3173 6.3174 # Set up the scripts for CONFIG_FILES section. 6.3175 # No need to generate them if there are no CONFIG_FILES. 6.3176 @@ -34394,7 +34425,7 @@ 6.3177 ac_cs_awk_cr=$ac_cr 6.3178 fi 6.3179 6.3180 -echo 'BEGIN {' >"$tmp/subs1.awk" && 6.3181 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 6.3182 _ACEOF 6.3183 6.3184 6.3185 @@ -34422,7 +34453,7 @@ 6.3186 rm -f conf$$subs.sh 6.3187 6.3188 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 6.3189 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 6.3190 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 6.3191 _ACEOF 6.3192 sed -n ' 6.3193 h 6.3194 @@ -34470,7 +34501,7 @@ 6.3195 rm -f conf$$subs.awk 6.3196 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 6.3197 _ACAWK 6.3198 -cat >>"\$tmp/subs1.awk" <<_ACAWK && 6.3199 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 6.3200 for (key in S) S_is_set[key] = 1 6.3201 FS = "" 6.3202 6.3203 @@ -34502,7 +34533,7 @@ 6.3204 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 6.3205 else 6.3206 cat 6.3207 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 6.3208 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 6.3209 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 6.3210 _ACEOF 6.3211 6.3212 @@ -34536,7 +34567,7 @@ 6.3213 # No need to generate them if there are no CONFIG_HEADERS. 6.3214 # This happens for instance with `./config.status Makefile'. 6.3215 if test -n "$CONFIG_HEADERS"; then 6.3216 -cat >"$tmp/defines.awk" <<\_ACAWK || 6.3217 +cat >"$ac_tmp/defines.awk" <<\_ACAWK || 6.3218 BEGIN { 6.3219 _ACEOF 6.3220 6.3221 @@ -34548,8 +34579,8 @@ 6.3222 # handling of long lines. 6.3223 ac_delim='%!_!# ' 6.3224 for ac_last_try in false false :; do 6.3225 - ac_t=`sed -n "/$ac_delim/p" confdefs.h` 6.3226 - if test -z "$ac_t"; then 6.3227 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 6.3228 + if test -z "$ac_tt"; then 6.3229 break 6.3230 elif $ac_last_try; then 6.3231 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 6.3232 @@ -34669,7 +34700,7 @@ 6.3233 for ac_f 6.3234 do 6.3235 case $ac_f in 6.3236 - -) ac_f="$tmp/stdin";; 6.3237 + -) ac_f="$ac_tmp/stdin";; 6.3238 *) # Look for the file first in the build tree, then in the source tree 6.3239 # (if the path is not absolute). The absolute path cannot be DOS-style, 6.3240 # because $ac_f cannot contain `:'. 6.3241 @@ -34704,7 +34735,7 @@ 6.3242 esac 6.3243 6.3244 case $ac_tag in 6.3245 - *:-:* | *:-) cat >"$tmp/stdin" \ 6.3246 + *:-:* | *:-) cat >"$ac_tmp/stdin" \ 6.3247 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 6.3248 esac 6.3249 ;; 6.3250 @@ -34830,21 +34861,22 @@ 6.3251 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 6.3252 $ac_datarootdir_hack 6.3253 " 6.3254 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 6.3255 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 6.3256 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 6.3257 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 6.3258 6.3259 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 6.3260 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 6.3261 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 6.3262 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 6.3263 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 6.3264 + "$ac_tmp/out"`; test -z "$ac_out"; } && 6.3265 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 6.3266 which seems to be undefined. Please make sure it is defined" >&5 6.3267 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 6.3268 which seems to be undefined. Please make sure it is defined" >&2;} 6.3269 6.3270 - rm -f "$tmp/stdin" 6.3271 + rm -f "$ac_tmp/stdin" 6.3272 case $ac_file in 6.3273 - -) cat "$tmp/out" && rm -f "$tmp/out";; 6.3274 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 6.3275 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 6.3276 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 6.3277 esac \ 6.3278 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 6.3279 ;; 6.3280 @@ -34855,20 +34887,20 @@ 6.3281 if test x"$ac_file" != x-; then 6.3282 { 6.3283 $as_echo "/* $configure_input */" \ 6.3284 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 6.3285 - } >"$tmp/config.h" \ 6.3286 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 6.3287 + } >"$ac_tmp/config.h" \ 6.3288 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 6.3289 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 6.3290 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 6.3291 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 6.3292 $as_echo "$as_me: $ac_file is unchanged" >&6;} 6.3293 else 6.3294 rm -f "$ac_file" 6.3295 - mv "$tmp/config.h" "$ac_file" \ 6.3296 + mv "$ac_tmp/config.h" "$ac_file" \ 6.3297 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 6.3298 fi 6.3299 else 6.3300 $as_echo "/* $configure_input */" \ 6.3301 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 6.3302 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 6.3303 || as_fn_error $? "could not create -" "$LINENO" 5 6.3304 fi 6.3305 ;;
7.1 --- a/common/autoconf/help.m4 Fri Aug 16 16:22:23 2013 -0700 7.2 +++ b/common/autoconf/help.m4 Thu Sep 05 10:58:25 2013 -0700 7.3 @@ -83,7 +83,7 @@ 7.4 pulse) 7.5 PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;; 7.6 x11) 7.7 - PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;; 7.8 + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;; 7.9 ccache) 7.10 PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; 7.11 * ) 7.12 @@ -102,11 +102,11 @@ 7.13 cups) 7.14 PKGHANDLER_COMMAND="sudo yum install cups-devel" ;; 7.15 freetype2) 7.16 - PKGHANDLER_COMMAND="sudo yum install freetype2-devel" ;; 7.17 + PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;; 7.18 pulse) 7.19 PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;; 7.20 x11) 7.21 - PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;; 7.22 + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;; 7.23 ccache) 7.24 PKGHANDLER_COMMAND="sudo yum install ccache" ;; 7.25 * )
8.1 --- a/common/autoconf/libraries.m4 Fri Aug 16 16:22:23 2013 -0700 8.2 +++ b/common/autoconf/libraries.m4 Thu Sep 05 10:58:25 2013 -0700 8.3 @@ -185,7 +185,7 @@ 8.4 CFLAGS="$CFLAGS $X_CFLAGS" 8.5 8.6 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10 8.7 -AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h], 8.8 +AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h], 8.9 [X11_A_OK=yes], 8.10 [X11_A_OK=no; break], 8.11 [ # include <X11/Xlib.h> 8.12 @@ -197,7 +197,7 @@ 8.13 8.14 if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then 8.15 HELP_MSG_MISSING_DEPENDENCY([x11]) 8.16 - AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG]) 8.17 + AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG]) 8.18 fi 8.19 8.20 AC_SUBST(X_CFLAGS)
9.1 --- a/common/autoconf/platform.m4 Fri Aug 16 16:22:23 2013 -0700 9.2 +++ b/common/autoconf/platform.m4 Thu Sep 05 10:58:25 2013 -0700 9.3 @@ -412,17 +412,16 @@ 9.4 [ 9.5 # keep track of c/cxx flags that we added outselves... 9.6 # to prevent emitting warning... 9.7 - ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 9.8 - ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 9.9 - ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}" 9.10 + TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" 9.11 + AC_SUBST(TARGET_BITS_FLAG) 9.12 9.13 - CFLAGS="${CFLAGS}${ADDED_CFLAGS}" 9.14 - CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" 9.15 - LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" 9.16 + CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" 9.17 + CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" 9.18 + LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" 9.19 9.20 - CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" 9.21 - CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" 9.22 - LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" 9.23 + CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" 9.24 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" 9.25 + LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" 9.26 ]) 9.27 9.28 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
10.1 --- a/common/autoconf/spec.gmk.in Fri Aug 16 16:22:23 2013 -0700 10.2 +++ b/common/autoconf/spec.gmk.in Thu Sep 05 10:58:25 2013 -0700 10.3 @@ -305,6 +305,7 @@ 10.4 COMPILER_TYPE:=@COMPILER_TYPE@ 10.5 COMPILER_NAME:=@COMPILER_NAME@ 10.6 10.7 +TARGET_BITS_FLAG=@TARGET_BITS_FLAG@ 10.8 COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@ 10.9 10.10 CC_OUT_OPTION:=@CC_OUT_OPTION@
11.1 --- a/common/autoconf/toolchain.m4 Fri Aug 16 16:22:23 2013 -0700 11.2 +++ b/common/autoconf/toolchain.m4 Thu Sep 05 10:58:25 2013 -0700 11.3 @@ -905,7 +905,7 @@ 11.4 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS" 11.5 fi 11.6 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 11.7 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" 11.8 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" 11.9 # Setting these parameters makes it an error to link to macosx APIs that are 11.10 # newer than the given OS version and makes the linked binaries compatible even 11.11 # if built on a newer version of the OS.
12.1 --- a/common/makefiles/IdlCompilation.gmk Fri Aug 16 16:22:23 2013 -0700 12.2 +++ b/common/makefiles/IdlCompilation.gmk Thu Sep 05 10:58:25 2013 -0700 12.3 @@ -83,9 +83,6 @@ 12.4 $(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) 12.5 $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk)) 12.6 12.7 -# Remove any relative addressing in the paths. 12.8 -$1_SRC := $$(abspath $$($1_SRC)) 12.9 -$1_BIN := $$(abspath $$($1_BIN)) 12.10 # Find all existing java files and existing class files. 12.11 $$(eval $$(call MakeDir,$$($1_BIN))) 12.12 $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
13.1 --- a/common/makefiles/Main.gmk Fri Aug 16 16:22:23 2013 -0700 13.2 +++ b/common/makefiles/Main.gmk Thu Sep 05 10:58:25 2013 -0700 13.3 @@ -183,7 +183,7 @@ 13.4 test: images test-only 13.5 test-only: start-make 13.6 @$(call TargetEnter) 13.7 - @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true 13.8 + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true 13.9 @$(call TargetExit) 13.10 13.11 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be 13.12 @@ -204,7 +204,7 @@ 13.13 # If the output directory was created by configure and now becomes empty, remove it as well. 13.14 # FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh! 13.15 dist-clean: clean 13.16 - @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp) 13.17 + @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers) 13.18 @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \ 13.19 if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \ 13.20 $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ;\ 13.21 @@ -242,7 +242,7 @@ 13.22 13.23 .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs 13.24 .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only 13.25 -.PHONY: all clean dist-clean bootcycle-images start-make 13.26 +.PHONY: default all clean dist-clean bootcycle-images start-make 13.27 .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build 13.28 .PHONY: profiles profiles-only profiles-oscheck 13.29
14.1 --- a/test/Makefile Fri Aug 16 16:22:23 2013 -0700 14.2 +++ b/test/Makefile Thu Sep 05 10:58:25 2013 -0700 14.3 @@ -49,61 +49,22 @@ 14.4 fi 14.5 endef 14.6 14.7 -# Test target list for langtools repository 14.8 -LANGTOOLS_TEST_LIST = langtools_jtreg 14.9 - 14.10 -# Test target list for jdk repository 14.11 -JDK_ALL_TEST_LIST = \ 14.12 - jdk_beans1 \ 14.13 - jdk_io \ 14.14 - jdk_lang \ 14.15 - jdk_math \ 14.16 - jdk_other \ 14.17 - jdk_net \ 14.18 - jdk_nio \ 14.19 - jdk_security1 \ 14.20 - jdk_text \ 14.21 - jdk_util \ 14.22 - jdk_time \ 14.23 - jdk_awt \ 14.24 - jdk_beans2 jdk_beans3 \ 14.25 - jdk_management \ 14.26 - jdk_jmx \ 14.27 - jdk_security2 jdk_security3 \ 14.28 - jdk_rmi \ 14.29 - jdk_sound \ 14.30 - jdk_swing \ 14.31 - jdk_tools \ 14.32 - jdk_jdi \ 14.33 - jdk_jfr 14.34 - 14.35 -# Theses are meta test targets in jdk 14.36 -JDK_META_TEST_LIST = jdk_all jdk_default jdk_core 14.37 - 14.38 -# These are the current jck test targets in the jdk repository 14.39 -JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime 14.40 - 14.41 # Default test target (core) 14.42 -default: jdk_core $(LANGTOOLS_TEST_LIST) 14.43 +default: jdk_core langtools_jtreg 14.44 14.45 # All testing 14.46 -all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) 14.47 +all: jdk_all langtools_all 14.48 14.49 # Test targets 14.50 -$(LANGTOOLS_TEST_LIST): 14.51 - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) 14.52 +langtools_% : 14.53 + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) 14.54 14.55 -$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): 14.56 - @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) 14.57 - 14.58 -clean: 14.59 +jdk_% : 14.60 + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) 14.61 14.62 ################################################################ 14.63 14.64 # Phony targets (e.g. these are not filenames) 14.65 -.PHONY: all clean \ 14.66 - $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ 14.67 - $(LANGTOOLS_TEST_LIST) 14.68 +.PHONY: all clean 14.69 14.70 ################################################################ 14.71 -
