Merge

Fri, 13 Sep 2013 10:14:55 -0300

author
jlaskey
date
Fri, 13 Sep 2013 10:14:55 -0300
changeset 900
ddf76977d04a
parent 899
96f207364e46
parent 791
73355c4c1bc8
child 901
8b92b08993a8

Merge

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/bin/hgforest.sh file | annotate | diff | comparison | revisions
common/makefiles/Main.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Aug 27 16:05:30 2013 -0300
     1.2 +++ b/.hgtags	Fri Sep 13 10:14:55 2013 -0300
     1.3 @@ -226,3 +226,5 @@
     1.4  5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
     1.5  b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
     1.6  96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
     1.7 +5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
     1.8 +8e7b4d9fb00fdf1334376aeac050c9bca6d1b383 jdk8-b106
     2.1 --- a/NewMakefile.gmk	Tue Aug 27 16:05:30 2013 -0300
     2.2 +++ b/NewMakefile.gmk	Fri Sep 13 10:14:55 2013 -0300
     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)
     3.1 --- a/README-builds.html	Tue Aug 27 16:05:30 2013 -0300
     3.2 +++ b/README-builds.html	Fri Sep 13 10:14:55 2013 -0300
     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	Tue Aug 27 16:05:30 2013 -0300
     4.2 +++ b/common/autoconf/autogen.sh	Fri Sep 13 10:14:55 2013 -0300
     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	Tue Aug 27 16:05:30 2013 -0300
     5.2 +++ b/common/autoconf/configure.ac	Fri Sep 13 10:14:55 2013 -0300
     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	Tue Aug 27 16:05:30 2013 -0300
     6.2 +++ b/common/autoconf/generated-configure.sh	Fri Sep 13 10:14:55 2013 -0300
     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 @@ -1462,7 +1490,7 @@
   6.184      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
   6.185      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   6.186        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
   6.187 -    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
   6.188 +    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
   6.189      ;;
   6.190  
   6.191    esac
   6.192 @@ -1513,8 +1541,6 @@
   6.193  if test "x$host_alias" != x; then
   6.194    if test "x$build_alias" = x; then
   6.195      cross_compiling=maybe
   6.196 -    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
   6.197 -    If a cross compiler is detected then cross compile mode will be used" >&2
   6.198    elif test "x$build_alias" != "x$host_alias"; then
   6.199      cross_compiling=yes
   6.200    fi
   6.201 @@ -1898,9 +1924,9 @@
   6.202  if $ac_init_version; then
   6.203    cat <<\_ACEOF
   6.204  OpenJDK configure jdk8
   6.205 -generated by GNU Autoconf 2.67
   6.206 -
   6.207 -Copyright (C) 2010 Free Software Foundation, Inc.
   6.208 +generated by GNU Autoconf 2.69
   6.209 +
   6.210 +Copyright (C) 2012 Free Software Foundation, Inc.
   6.211  This configure script is free software; the Free Software Foundation
   6.212  gives unlimited permission to copy, distribute and modify it.
   6.213  _ACEOF
   6.214 @@ -1944,7 +1970,7 @@
   6.215  
   6.216  	ac_retval=1
   6.217  fi
   6.218 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.219 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.220    as_fn_set_status $ac_retval
   6.221  
   6.222  } # ac_fn_c_try_compile
   6.223 @@ -1982,7 +2008,7 @@
   6.224  
   6.225  	ac_retval=1
   6.226  fi
   6.227 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.228 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.229    as_fn_set_status $ac_retval
   6.230  
   6.231  } # ac_fn_cxx_try_compile
   6.232 @@ -2020,7 +2046,7 @@
   6.233  
   6.234  	ac_retval=1
   6.235  fi
   6.236 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.237 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.238    as_fn_set_status $ac_retval
   6.239  
   6.240  } # ac_fn_objc_try_compile
   6.241 @@ -2057,7 +2083,7 @@
   6.242  
   6.243      ac_retval=1
   6.244  fi
   6.245 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.246 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.247    as_fn_set_status $ac_retval
   6.248  
   6.249  } # ac_fn_c_try_cpp
   6.250 @@ -2094,7 +2120,7 @@
   6.251  
   6.252      ac_retval=1
   6.253  fi
   6.254 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.255 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.256    as_fn_set_status $ac_retval
   6.257  
   6.258  } # ac_fn_cxx_try_cpp
   6.259 @@ -2107,10 +2133,10 @@
   6.260  ac_fn_cxx_check_header_mongrel ()
   6.261  {
   6.262    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   6.263 -  if eval "test \"\${$3+set}\"" = set; then :
   6.264 +  if eval \${$3+:} false; then :
   6.265    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   6.266  $as_echo_n "checking for $2... " >&6; }
   6.267 -if eval "test \"\${$3+set}\"" = set; then :
   6.268 +if eval \${$3+:} false; then :
   6.269    $as_echo_n "(cached) " >&6
   6.270  fi
   6.271  eval ac_res=\$$3
   6.272 @@ -2177,7 +2203,7 @@
   6.273  esac
   6.274    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   6.275  $as_echo_n "checking for $2... " >&6; }
   6.276 -if eval "test \"\${$3+set}\"" = set; then :
   6.277 +if eval \${$3+:} false; then :
   6.278    $as_echo_n "(cached) " >&6
   6.279  else
   6.280    eval "$3=\$ac_header_compiler"
   6.281 @@ -2186,7 +2212,7 @@
   6.282  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   6.283  $as_echo "$ac_res" >&6; }
   6.284  fi
   6.285 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.286 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.287  
   6.288  } # ac_fn_cxx_check_header_mongrel
   6.289  
   6.290 @@ -2227,7 +2253,7 @@
   6.291         ac_retval=$ac_status
   6.292  fi
   6.293    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   6.294 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.295 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.296    as_fn_set_status $ac_retval
   6.297  
   6.298  } # ac_fn_cxx_try_run
   6.299 @@ -2241,7 +2267,7 @@
   6.300    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   6.301    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   6.302  $as_echo_n "checking for $2... " >&6; }
   6.303 -if eval "test \"\${$3+set}\"" = set; then :
   6.304 +if eval \${$3+:} false; then :
   6.305    $as_echo_n "(cached) " >&6
   6.306  else
   6.307    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   6.308 @@ -2259,7 +2285,7 @@
   6.309  eval ac_res=\$$3
   6.310  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   6.311  $as_echo "$ac_res" >&6; }
   6.312 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.313 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.314  
   6.315  } # ac_fn_cxx_check_header_compile
   6.316  
   6.317 @@ -2280,7 +2306,8 @@
   6.318  main ()
   6.319  {
   6.320  static int test_array [1 - 2 * !(($2) >= 0)];
   6.321 -test_array [0] = 0
   6.322 +test_array [0] = 0;
   6.323 +return test_array [0];
   6.324  
   6.325    ;
   6.326    return 0;
   6.327 @@ -2296,7 +2323,8 @@
   6.328  main ()
   6.329  {
   6.330  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
   6.331 -test_array [0] = 0
   6.332 +test_array [0] = 0;
   6.333 +return test_array [0];
   6.334  
   6.335    ;
   6.336    return 0;
   6.337 @@ -2322,7 +2350,8 @@
   6.338  main ()
   6.339  {
   6.340  static int test_array [1 - 2 * !(($2) < 0)];
   6.341 -test_array [0] = 0
   6.342 +test_array [0] = 0;
   6.343 +return test_array [0];
   6.344  
   6.345    ;
   6.346    return 0;
   6.347 @@ -2338,7 +2367,8 @@
   6.348  main ()
   6.349  {
   6.350  static int test_array [1 - 2 * !(($2) >= $ac_mid)];
   6.351 -test_array [0] = 0
   6.352 +test_array [0] = 0;
   6.353 +return test_array [0];
   6.354  
   6.355    ;
   6.356    return 0;
   6.357 @@ -2372,7 +2402,8 @@
   6.358  main ()
   6.359  {
   6.360  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
   6.361 -test_array [0] = 0
   6.362 +test_array [0] = 0;
   6.363 +return test_array [0];
   6.364  
   6.365    ;
   6.366    return 0;
   6.367 @@ -2436,7 +2467,7 @@
   6.368  rm -f conftest.val
   6.369  
   6.370    fi
   6.371 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.372 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.373    as_fn_set_status $ac_retval
   6.374  
   6.375  } # ac_fn_cxx_compute_int
   6.376 @@ -2468,7 +2499,7 @@
   6.377  	 test ! -s conftest.err
   6.378         } && test -s conftest$ac_exeext && {
   6.379  	 test "$cross_compiling" = yes ||
   6.380 -	 $as_test_x conftest$ac_exeext
   6.381 +	 test -x conftest$ac_exeext
   6.382         }; then :
   6.383    ac_retval=0
   6.384  else
   6.385 @@ -2482,7 +2513,7 @@
   6.386    # interfere with the next link command; also delete a directory that is
   6.387    # left behind by Apple's compiler.  We do this before executing the actions.
   6.388    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   6.389 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.390 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.391    as_fn_set_status $ac_retval
   6.392  
   6.393  } # ac_fn_cxx_try_link
   6.394 @@ -2495,7 +2526,7 @@
   6.395    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   6.396    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   6.397  $as_echo_n "checking for $2... " >&6; }
   6.398 -if eval "test \"\${$3+set}\"" = set; then :
   6.399 +if eval \${$3+:} false; then :
   6.400    $as_echo_n "(cached) " >&6
   6.401  else
   6.402    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   6.403 @@ -2550,7 +2581,7 @@
   6.404  eval ac_res=\$$3
   6.405  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   6.406  $as_echo "$ac_res" >&6; }
   6.407 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.408 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.409  
   6.410  } # ac_fn_cxx_check_func
   6.411  
   6.412 @@ -2563,7 +2594,7 @@
   6.413    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   6.414    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   6.415  $as_echo_n "checking for $2... " >&6; }
   6.416 -if eval "test \"\${$3+set}\"" = set; then :
   6.417 +if eval \${$3+:} false; then :
   6.418    $as_echo_n "(cached) " >&6
   6.419  else
   6.420    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   6.421 @@ -2581,7 +2612,7 @@
   6.422  eval ac_res=\$$3
   6.423  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   6.424  $as_echo "$ac_res" >&6; }
   6.425 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   6.426 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   6.427  
   6.428  } # ac_fn_c_check_header_compile
   6.429  cat >config.log <<_ACEOF
   6.430 @@ -2589,7 +2620,7 @@
   6.431  running configure, to aid debugging if configure makes a mistake.
   6.432  
   6.433  It was created by OpenJDK $as_me jdk8, which was
   6.434 -generated by GNU Autoconf 2.67.  Invocation command line was
   6.435 +generated by GNU Autoconf 2.69.  Invocation command line was
   6.436  
   6.437    $ $0 $@
   6.438  
   6.439 @@ -2847,7 +2878,7 @@
   6.440        || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   6.441  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   6.442  as_fn_error $? "failed to load site script $ac_site_file
   6.443 -See \`config.log' for more details" "$LINENO" 5 ; }
   6.444 +See \`config.log' for more details" "$LINENO" 5; }
   6.445    fi
   6.446  done
   6.447  
   6.448 @@ -3433,7 +3464,7 @@
   6.449      pulse)
   6.450          PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
   6.451      x11)
   6.452 -        PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;;
   6.453 +        PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
   6.454      ccache)
   6.455          PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
   6.456      * )
   6.457 @@ -3452,11 +3483,11 @@
   6.458      cups)
   6.459          PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
   6.460      freetype2)
   6.461 -        PKGHANDLER_COMMAND="sudo yum install freetype2-devel" ;;
   6.462 +        PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
   6.463      pulse)
   6.464          PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
   6.465      x11)
   6.466 -        PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;;
   6.467 +        PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
   6.468      ccache)
   6.469          PKGHANDLER_COMMAND="sudo yum install ccache" ;;
   6.470      * )
   6.471 @@ -3787,7 +3818,7 @@
   6.472  #CUSTOM_AUTOCONF_INCLUDE
   6.473  
   6.474  # Do not change or remove the following line, it is needed for consistency checks:
   6.475 -DATE_WHEN_GENERATED=1376579640
   6.476 +DATE_WHEN_GENERATED=1377850299
   6.477  
   6.478  ###############################################################################
   6.479  #
   6.480 @@ -3825,7 +3856,7 @@
   6.481  set dummy $ac_prog; ac_word=$2
   6.482  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.483  $as_echo_n "checking for $ac_word... " >&6; }
   6.484 -if test "${ac_cv_path_BASENAME+set}" = set; then :
   6.485 +if ${ac_cv_path_BASENAME+:} false; then :
   6.486    $as_echo_n "(cached) " >&6
   6.487  else
   6.488    case $BASENAME in
   6.489 @@ -3839,7 +3870,7 @@
   6.490    IFS=$as_save_IFS
   6.491    test -z "$as_dir" && as_dir=.
   6.492      for ac_exec_ext in '' $ac_executable_extensions; do
   6.493 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.494 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.495      ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
   6.496      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.497      break 2
   6.498 @@ -3884,7 +3915,7 @@
   6.499  set dummy $ac_prog; ac_word=$2
   6.500  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.501  $as_echo_n "checking for $ac_word... " >&6; }
   6.502 -if test "${ac_cv_path_BASH+set}" = set; then :
   6.503 +if ${ac_cv_path_BASH+:} false; then :
   6.504    $as_echo_n "(cached) " >&6
   6.505  else
   6.506    case $BASH in
   6.507 @@ -3898,7 +3929,7 @@
   6.508    IFS=$as_save_IFS
   6.509    test -z "$as_dir" && as_dir=.
   6.510      for ac_exec_ext in '' $ac_executable_extensions; do
   6.511 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.512 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.513      ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
   6.514      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.515      break 2
   6.516 @@ -3943,7 +3974,7 @@
   6.517  set dummy $ac_prog; ac_word=$2
   6.518  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.519  $as_echo_n "checking for $ac_word... " >&6; }
   6.520 -if test "${ac_cv_path_CAT+set}" = set; then :
   6.521 +if ${ac_cv_path_CAT+:} false; then :
   6.522    $as_echo_n "(cached) " >&6
   6.523  else
   6.524    case $CAT in
   6.525 @@ -3957,7 +3988,7 @@
   6.526    IFS=$as_save_IFS
   6.527    test -z "$as_dir" && as_dir=.
   6.528      for ac_exec_ext in '' $ac_executable_extensions; do
   6.529 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.530 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.531      ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
   6.532      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.533      break 2
   6.534 @@ -4002,7 +4033,7 @@
   6.535  set dummy $ac_prog; ac_word=$2
   6.536  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.537  $as_echo_n "checking for $ac_word... " >&6; }
   6.538 -if test "${ac_cv_path_CHMOD+set}" = set; then :
   6.539 +if ${ac_cv_path_CHMOD+:} false; then :
   6.540    $as_echo_n "(cached) " >&6
   6.541  else
   6.542    case $CHMOD in
   6.543 @@ -4016,7 +4047,7 @@
   6.544    IFS=$as_save_IFS
   6.545    test -z "$as_dir" && as_dir=.
   6.546      for ac_exec_ext in '' $ac_executable_extensions; do
   6.547 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.548 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.549      ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
   6.550      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.551      break 2
   6.552 @@ -4061,7 +4092,7 @@
   6.553  set dummy $ac_prog; ac_word=$2
   6.554  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.555  $as_echo_n "checking for $ac_word... " >&6; }
   6.556 -if test "${ac_cv_path_CMP+set}" = set; then :
   6.557 +if ${ac_cv_path_CMP+:} false; then :
   6.558    $as_echo_n "(cached) " >&6
   6.559  else
   6.560    case $CMP in
   6.561 @@ -4075,7 +4106,7 @@
   6.562    IFS=$as_save_IFS
   6.563    test -z "$as_dir" && as_dir=.
   6.564      for ac_exec_ext in '' $ac_executable_extensions; do
   6.565 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.566 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.567      ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
   6.568      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.569      break 2
   6.570 @@ -4120,7 +4151,7 @@
   6.571  set dummy $ac_prog; ac_word=$2
   6.572  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.573  $as_echo_n "checking for $ac_word... " >&6; }
   6.574 -if test "${ac_cv_path_COMM+set}" = set; then :
   6.575 +if ${ac_cv_path_COMM+:} false; then :
   6.576    $as_echo_n "(cached) " >&6
   6.577  else
   6.578    case $COMM in
   6.579 @@ -4134,7 +4165,7 @@
   6.580    IFS=$as_save_IFS
   6.581    test -z "$as_dir" && as_dir=.
   6.582      for ac_exec_ext in '' $ac_executable_extensions; do
   6.583 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.584 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.585      ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
   6.586      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.587      break 2
   6.588 @@ -4179,7 +4210,7 @@
   6.589  set dummy $ac_prog; ac_word=$2
   6.590  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.591  $as_echo_n "checking for $ac_word... " >&6; }
   6.592 -if test "${ac_cv_path_CP+set}" = set; then :
   6.593 +if ${ac_cv_path_CP+:} false; then :
   6.594    $as_echo_n "(cached) " >&6
   6.595  else
   6.596    case $CP in
   6.597 @@ -4193,7 +4224,7 @@
   6.598    IFS=$as_save_IFS
   6.599    test -z "$as_dir" && as_dir=.
   6.600      for ac_exec_ext in '' $ac_executable_extensions; do
   6.601 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.602 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.603      ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
   6.604      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.605      break 2
   6.606 @@ -4238,7 +4269,7 @@
   6.607  set dummy $ac_prog; ac_word=$2
   6.608  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.609  $as_echo_n "checking for $ac_word... " >&6; }
   6.610 -if test "${ac_cv_path_CPIO+set}" = set; then :
   6.611 +if ${ac_cv_path_CPIO+:} false; then :
   6.612    $as_echo_n "(cached) " >&6
   6.613  else
   6.614    case $CPIO in
   6.615 @@ -4252,7 +4283,7 @@
   6.616    IFS=$as_save_IFS
   6.617    test -z "$as_dir" && as_dir=.
   6.618      for ac_exec_ext in '' $ac_executable_extensions; do
   6.619 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.620 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.621      ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
   6.622      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.623      break 2
   6.624 @@ -4297,7 +4328,7 @@
   6.625  set dummy $ac_prog; ac_word=$2
   6.626  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.627  $as_echo_n "checking for $ac_word... " >&6; }
   6.628 -if test "${ac_cv_path_CUT+set}" = set; then :
   6.629 +if ${ac_cv_path_CUT+:} false; then :
   6.630    $as_echo_n "(cached) " >&6
   6.631  else
   6.632    case $CUT in
   6.633 @@ -4311,7 +4342,7 @@
   6.634    IFS=$as_save_IFS
   6.635    test -z "$as_dir" && as_dir=.
   6.636      for ac_exec_ext in '' $ac_executable_extensions; do
   6.637 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.638 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.639      ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
   6.640      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.641      break 2
   6.642 @@ -4356,7 +4387,7 @@
   6.643  set dummy $ac_prog; ac_word=$2
   6.644  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.645  $as_echo_n "checking for $ac_word... " >&6; }
   6.646 -if test "${ac_cv_path_DATE+set}" = set; then :
   6.647 +if ${ac_cv_path_DATE+:} false; then :
   6.648    $as_echo_n "(cached) " >&6
   6.649  else
   6.650    case $DATE in
   6.651 @@ -4370,7 +4401,7 @@
   6.652    IFS=$as_save_IFS
   6.653    test -z "$as_dir" && as_dir=.
   6.654      for ac_exec_ext in '' $ac_executable_extensions; do
   6.655 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.656 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.657      ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
   6.658      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.659      break 2
   6.660 @@ -4415,7 +4446,7 @@
   6.661  set dummy $ac_prog; ac_word=$2
   6.662  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.663  $as_echo_n "checking for $ac_word... " >&6; }
   6.664 -if test "${ac_cv_path_DIFF+set}" = set; then :
   6.665 +if ${ac_cv_path_DIFF+:} false; then :
   6.666    $as_echo_n "(cached) " >&6
   6.667  else
   6.668    case $DIFF in
   6.669 @@ -4429,7 +4460,7 @@
   6.670    IFS=$as_save_IFS
   6.671    test -z "$as_dir" && as_dir=.
   6.672      for ac_exec_ext in '' $ac_executable_extensions; do
   6.673 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.674 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.675      ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
   6.676      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.677      break 2
   6.678 @@ -4474,7 +4505,7 @@
   6.679  set dummy $ac_prog; ac_word=$2
   6.680  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.681  $as_echo_n "checking for $ac_word... " >&6; }
   6.682 -if test "${ac_cv_path_DIRNAME+set}" = set; then :
   6.683 +if ${ac_cv_path_DIRNAME+:} false; then :
   6.684    $as_echo_n "(cached) " >&6
   6.685  else
   6.686    case $DIRNAME in
   6.687 @@ -4488,7 +4519,7 @@
   6.688    IFS=$as_save_IFS
   6.689    test -z "$as_dir" && as_dir=.
   6.690      for ac_exec_ext in '' $ac_executable_extensions; do
   6.691 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.692 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.693      ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
   6.694      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.695      break 2
   6.696 @@ -4533,7 +4564,7 @@
   6.697  set dummy $ac_prog; ac_word=$2
   6.698  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.699  $as_echo_n "checking for $ac_word... " >&6; }
   6.700 -if test "${ac_cv_path_ECHO+set}" = set; then :
   6.701 +if ${ac_cv_path_ECHO+:} false; then :
   6.702    $as_echo_n "(cached) " >&6
   6.703  else
   6.704    case $ECHO in
   6.705 @@ -4547,7 +4578,7 @@
   6.706    IFS=$as_save_IFS
   6.707    test -z "$as_dir" && as_dir=.
   6.708      for ac_exec_ext in '' $ac_executable_extensions; do
   6.709 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.710 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.711      ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
   6.712      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.713      break 2
   6.714 @@ -4592,7 +4623,7 @@
   6.715  set dummy $ac_prog; ac_word=$2
   6.716  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.717  $as_echo_n "checking for $ac_word... " >&6; }
   6.718 -if test "${ac_cv_path_EXPR+set}" = set; then :
   6.719 +if ${ac_cv_path_EXPR+:} false; then :
   6.720    $as_echo_n "(cached) " >&6
   6.721  else
   6.722    case $EXPR in
   6.723 @@ -4606,7 +4637,7 @@
   6.724    IFS=$as_save_IFS
   6.725    test -z "$as_dir" && as_dir=.
   6.726      for ac_exec_ext in '' $ac_executable_extensions; do
   6.727 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.728 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.729      ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
   6.730      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.731      break 2
   6.732 @@ -4651,7 +4682,7 @@
   6.733  set dummy $ac_prog; ac_word=$2
   6.734  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.735  $as_echo_n "checking for $ac_word... " >&6; }
   6.736 -if test "${ac_cv_path_FILE+set}" = set; then :
   6.737 +if ${ac_cv_path_FILE+:} false; then :
   6.738    $as_echo_n "(cached) " >&6
   6.739  else
   6.740    case $FILE in
   6.741 @@ -4665,7 +4696,7 @@
   6.742    IFS=$as_save_IFS
   6.743    test -z "$as_dir" && as_dir=.
   6.744      for ac_exec_ext in '' $ac_executable_extensions; do
   6.745 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.746 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.747      ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
   6.748      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.749      break 2
   6.750 @@ -4710,7 +4741,7 @@
   6.751  set dummy $ac_prog; ac_word=$2
   6.752  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.753  $as_echo_n "checking for $ac_word... " >&6; }
   6.754 -if test "${ac_cv_path_FIND+set}" = set; then :
   6.755 +if ${ac_cv_path_FIND+:} false; then :
   6.756    $as_echo_n "(cached) " >&6
   6.757  else
   6.758    case $FIND in
   6.759 @@ -4724,7 +4755,7 @@
   6.760    IFS=$as_save_IFS
   6.761    test -z "$as_dir" && as_dir=.
   6.762      for ac_exec_ext in '' $ac_executable_extensions; do
   6.763 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.764 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.765      ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
   6.766      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.767      break 2
   6.768 @@ -4769,7 +4800,7 @@
   6.769  set dummy $ac_prog; ac_word=$2
   6.770  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.771  $as_echo_n "checking for $ac_word... " >&6; }
   6.772 -if test "${ac_cv_path_HEAD+set}" = set; then :
   6.773 +if ${ac_cv_path_HEAD+:} false; then :
   6.774    $as_echo_n "(cached) " >&6
   6.775  else
   6.776    case $HEAD in
   6.777 @@ -4783,7 +4814,7 @@
   6.778    IFS=$as_save_IFS
   6.779    test -z "$as_dir" && as_dir=.
   6.780      for ac_exec_ext in '' $ac_executable_extensions; do
   6.781 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.782 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.783      ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
   6.784      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.785      break 2
   6.786 @@ -4828,7 +4859,7 @@
   6.787  set dummy $ac_prog; ac_word=$2
   6.788  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.789  $as_echo_n "checking for $ac_word... " >&6; }
   6.790 -if test "${ac_cv_path_LN+set}" = set; then :
   6.791 +if ${ac_cv_path_LN+:} false; then :
   6.792    $as_echo_n "(cached) " >&6
   6.793  else
   6.794    case $LN in
   6.795 @@ -4842,7 +4873,7 @@
   6.796    IFS=$as_save_IFS
   6.797    test -z "$as_dir" && as_dir=.
   6.798      for ac_exec_ext in '' $ac_executable_extensions; do
   6.799 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.800 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.801      ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
   6.802      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.803      break 2
   6.804 @@ -4887,7 +4918,7 @@
   6.805  set dummy $ac_prog; ac_word=$2
   6.806  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.807  $as_echo_n "checking for $ac_word... " >&6; }
   6.808 -if test "${ac_cv_path_LS+set}" = set; then :
   6.809 +if ${ac_cv_path_LS+:} false; then :
   6.810    $as_echo_n "(cached) " >&6
   6.811  else
   6.812    case $LS in
   6.813 @@ -4901,7 +4932,7 @@
   6.814    IFS=$as_save_IFS
   6.815    test -z "$as_dir" && as_dir=.
   6.816      for ac_exec_ext in '' $ac_executable_extensions; do
   6.817 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.818 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.819      ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
   6.820      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.821      break 2
   6.822 @@ -4946,7 +4977,7 @@
   6.823  set dummy $ac_prog; ac_word=$2
   6.824  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.825  $as_echo_n "checking for $ac_word... " >&6; }
   6.826 -if test "${ac_cv_path_MKDIR+set}" = set; then :
   6.827 +if ${ac_cv_path_MKDIR+:} false; then :
   6.828    $as_echo_n "(cached) " >&6
   6.829  else
   6.830    case $MKDIR in
   6.831 @@ -4960,7 +4991,7 @@
   6.832    IFS=$as_save_IFS
   6.833    test -z "$as_dir" && as_dir=.
   6.834      for ac_exec_ext in '' $ac_executable_extensions; do
   6.835 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.836 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.837      ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
   6.838      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.839      break 2
   6.840 @@ -5005,7 +5036,7 @@
   6.841  set dummy $ac_prog; ac_word=$2
   6.842  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.843  $as_echo_n "checking for $ac_word... " >&6; }
   6.844 -if test "${ac_cv_path_MKTEMP+set}" = set; then :
   6.845 +if ${ac_cv_path_MKTEMP+:} false; then :
   6.846    $as_echo_n "(cached) " >&6
   6.847  else
   6.848    case $MKTEMP in
   6.849 @@ -5019,7 +5050,7 @@
   6.850    IFS=$as_save_IFS
   6.851    test -z "$as_dir" && as_dir=.
   6.852      for ac_exec_ext in '' $ac_executable_extensions; do
   6.853 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.854 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.855      ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
   6.856      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.857      break 2
   6.858 @@ -5064,7 +5095,7 @@
   6.859  set dummy $ac_prog; ac_word=$2
   6.860  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.861  $as_echo_n "checking for $ac_word... " >&6; }
   6.862 -if test "${ac_cv_path_MV+set}" = set; then :
   6.863 +if ${ac_cv_path_MV+:} false; then :
   6.864    $as_echo_n "(cached) " >&6
   6.865  else
   6.866    case $MV in
   6.867 @@ -5078,7 +5109,7 @@
   6.868    IFS=$as_save_IFS
   6.869    test -z "$as_dir" && as_dir=.
   6.870      for ac_exec_ext in '' $ac_executable_extensions; do
   6.871 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.872 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.873      ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
   6.874      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.875      break 2
   6.876 @@ -5123,7 +5154,7 @@
   6.877  set dummy $ac_prog; ac_word=$2
   6.878  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.879  $as_echo_n "checking for $ac_word... " >&6; }
   6.880 -if test "${ac_cv_path_PRINTF+set}" = set; then :
   6.881 +if ${ac_cv_path_PRINTF+:} false; then :
   6.882    $as_echo_n "(cached) " >&6
   6.883  else
   6.884    case $PRINTF in
   6.885 @@ -5137,7 +5168,7 @@
   6.886    IFS=$as_save_IFS
   6.887    test -z "$as_dir" && as_dir=.
   6.888      for ac_exec_ext in '' $ac_executable_extensions; do
   6.889 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.890 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.891      ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
   6.892      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.893      break 2
   6.894 @@ -5182,7 +5213,7 @@
   6.895  set dummy $ac_prog; ac_word=$2
   6.896  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.897  $as_echo_n "checking for $ac_word... " >&6; }
   6.898 -if test "${ac_cv_path_RM+set}" = set; then :
   6.899 +if ${ac_cv_path_RM+:} false; then :
   6.900    $as_echo_n "(cached) " >&6
   6.901  else
   6.902    case $RM in
   6.903 @@ -5196,7 +5227,7 @@
   6.904    IFS=$as_save_IFS
   6.905    test -z "$as_dir" && as_dir=.
   6.906      for ac_exec_ext in '' $ac_executable_extensions; do
   6.907 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.908 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.909      ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
   6.910      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.911      break 2
   6.912 @@ -5241,7 +5272,7 @@
   6.913  set dummy $ac_prog; ac_word=$2
   6.914  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.915  $as_echo_n "checking for $ac_word... " >&6; }
   6.916 -if test "${ac_cv_path_SH+set}" = set; then :
   6.917 +if ${ac_cv_path_SH+:} false; then :
   6.918    $as_echo_n "(cached) " >&6
   6.919  else
   6.920    case $SH in
   6.921 @@ -5255,7 +5286,7 @@
   6.922    IFS=$as_save_IFS
   6.923    test -z "$as_dir" && as_dir=.
   6.924      for ac_exec_ext in '' $ac_executable_extensions; do
   6.925 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.926 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.927      ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
   6.928      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.929      break 2
   6.930 @@ -5300,7 +5331,7 @@
   6.931  set dummy $ac_prog; ac_word=$2
   6.932  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.933  $as_echo_n "checking for $ac_word... " >&6; }
   6.934 -if test "${ac_cv_path_SORT+set}" = set; then :
   6.935 +if ${ac_cv_path_SORT+:} false; then :
   6.936    $as_echo_n "(cached) " >&6
   6.937  else
   6.938    case $SORT in
   6.939 @@ -5314,7 +5345,7 @@
   6.940    IFS=$as_save_IFS
   6.941    test -z "$as_dir" && as_dir=.
   6.942      for ac_exec_ext in '' $ac_executable_extensions; do
   6.943 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.944 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.945      ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
   6.946      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.947      break 2
   6.948 @@ -5359,7 +5390,7 @@
   6.949  set dummy $ac_prog; ac_word=$2
   6.950  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.951  $as_echo_n "checking for $ac_word... " >&6; }
   6.952 -if test "${ac_cv_path_TAIL+set}" = set; then :
   6.953 +if ${ac_cv_path_TAIL+:} false; then :
   6.954    $as_echo_n "(cached) " >&6
   6.955  else
   6.956    case $TAIL in
   6.957 @@ -5373,7 +5404,7 @@
   6.958    IFS=$as_save_IFS
   6.959    test -z "$as_dir" && as_dir=.
   6.960      for ac_exec_ext in '' $ac_executable_extensions; do
   6.961 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.962 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.963      ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext"
   6.964      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.965      break 2
   6.966 @@ -5418,7 +5449,7 @@
   6.967  set dummy $ac_prog; ac_word=$2
   6.968  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.969  $as_echo_n "checking for $ac_word... " >&6; }
   6.970 -if test "${ac_cv_path_TAR+set}" = set; then :
   6.971 +if ${ac_cv_path_TAR+:} false; then :
   6.972    $as_echo_n "(cached) " >&6
   6.973  else
   6.974    case $TAR in
   6.975 @@ -5432,7 +5463,7 @@
   6.976    IFS=$as_save_IFS
   6.977    test -z "$as_dir" && as_dir=.
   6.978      for ac_exec_ext in '' $ac_executable_extensions; do
   6.979 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.980 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.981      ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
   6.982      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   6.983      break 2
   6.984 @@ -5477,7 +5508,7 @@
   6.985  set dummy $ac_prog; ac_word=$2
   6.986  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   6.987  $as_echo_n "checking for $ac_word... " >&6; }
   6.988 -if test "${ac_cv_path_TEE+set}" = set; then :
   6.989 +if ${ac_cv_path_TEE+:} false; then :
   6.990    $as_echo_n "(cached) " >&6
   6.991  else
   6.992    case $TEE in
   6.993 @@ -5491,7 +5522,7 @@
   6.994    IFS=$as_save_IFS
   6.995    test -z "$as_dir" && as_dir=.
   6.996      for ac_exec_ext in '' $ac_executable_extensions; do
   6.997 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   6.998 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   6.999      ac_cv_path_TEE="$as_dir/$ac_word$ac_exec_ext"
  6.1000      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1001      break 2
  6.1002 @@ -5536,7 +5567,7 @@
  6.1003  set dummy $ac_prog; ac_word=$2
  6.1004  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1005  $as_echo_n "checking for $ac_word... " >&6; }
  6.1006 -if test "${ac_cv_path_TOUCH+set}" = set; then :
  6.1007 +if ${ac_cv_path_TOUCH+:} false; then :
  6.1008    $as_echo_n "(cached) " >&6
  6.1009  else
  6.1010    case $TOUCH in
  6.1011 @@ -5550,7 +5581,7 @@
  6.1012    IFS=$as_save_IFS
  6.1013    test -z "$as_dir" && as_dir=.
  6.1014      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1015 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1016 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1017      ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
  6.1018      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1019      break 2
  6.1020 @@ -5595,7 +5626,7 @@
  6.1021  set dummy $ac_prog; ac_word=$2
  6.1022  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1023  $as_echo_n "checking for $ac_word... " >&6; }
  6.1024 -if test "${ac_cv_path_TR+set}" = set; then :
  6.1025 +if ${ac_cv_path_TR+:} false; then :
  6.1026    $as_echo_n "(cached) " >&6
  6.1027  else
  6.1028    case $TR in
  6.1029 @@ -5609,7 +5640,7 @@
  6.1030    IFS=$as_save_IFS
  6.1031    test -z "$as_dir" && as_dir=.
  6.1032      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1033 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1034 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1035      ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
  6.1036      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1037      break 2
  6.1038 @@ -5654,7 +5685,7 @@
  6.1039  set dummy $ac_prog; ac_word=$2
  6.1040  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1041  $as_echo_n "checking for $ac_word... " >&6; }
  6.1042 -if test "${ac_cv_path_UNAME+set}" = set; then :
  6.1043 +if ${ac_cv_path_UNAME+:} false; then :
  6.1044    $as_echo_n "(cached) " >&6
  6.1045  else
  6.1046    case $UNAME in
  6.1047 @@ -5668,7 +5699,7 @@
  6.1048    IFS=$as_save_IFS
  6.1049    test -z "$as_dir" && as_dir=.
  6.1050      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1051 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1052 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1053      ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
  6.1054      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1055      break 2
  6.1056 @@ -5713,7 +5744,7 @@
  6.1057  set dummy $ac_prog; ac_word=$2
  6.1058  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1059  $as_echo_n "checking for $ac_word... " >&6; }
  6.1060 -if test "${ac_cv_path_UNIQ+set}" = set; then :
  6.1061 +if ${ac_cv_path_UNIQ+:} false; then :
  6.1062    $as_echo_n "(cached) " >&6
  6.1063  else
  6.1064    case $UNIQ in
  6.1065 @@ -5727,7 +5758,7 @@
  6.1066    IFS=$as_save_IFS
  6.1067    test -z "$as_dir" && as_dir=.
  6.1068      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1069 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1070 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1071      ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext"
  6.1072      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1073      break 2
  6.1074 @@ -5772,7 +5803,7 @@
  6.1075  set dummy $ac_prog; ac_word=$2
  6.1076  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1077  $as_echo_n "checking for $ac_word... " >&6; }
  6.1078 -if test "${ac_cv_path_WC+set}" = set; then :
  6.1079 +if ${ac_cv_path_WC+:} false; then :
  6.1080    $as_echo_n "(cached) " >&6
  6.1081  else
  6.1082    case $WC in
  6.1083 @@ -5786,7 +5817,7 @@
  6.1084    IFS=$as_save_IFS
  6.1085    test -z "$as_dir" && as_dir=.
  6.1086      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1087 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1088 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1089      ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext"
  6.1090      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1091      break 2
  6.1092 @@ -5831,7 +5862,7 @@
  6.1093  set dummy $ac_prog; ac_word=$2
  6.1094  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1095  $as_echo_n "checking for $ac_word... " >&6; }
  6.1096 -if test "${ac_cv_path_WHICH+set}" = set; then :
  6.1097 +if ${ac_cv_path_WHICH+:} false; then :
  6.1098    $as_echo_n "(cached) " >&6
  6.1099  else
  6.1100    case $WHICH in
  6.1101 @@ -5845,7 +5876,7 @@
  6.1102    IFS=$as_save_IFS
  6.1103    test -z "$as_dir" && as_dir=.
  6.1104      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1105 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1106 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1107      ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext"
  6.1108      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1109      break 2
  6.1110 @@ -5890,7 +5921,7 @@
  6.1111  set dummy $ac_prog; ac_word=$2
  6.1112  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1113  $as_echo_n "checking for $ac_word... " >&6; }
  6.1114 -if test "${ac_cv_path_XARGS+set}" = set; then :
  6.1115 +if ${ac_cv_path_XARGS+:} false; then :
  6.1116    $as_echo_n "(cached) " >&6
  6.1117  else
  6.1118    case $XARGS in
  6.1119 @@ -5904,7 +5935,7 @@
  6.1120    IFS=$as_save_IFS
  6.1121    test -z "$as_dir" && as_dir=.
  6.1122      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1123 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1124 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1125      ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext"
  6.1126      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1127      break 2
  6.1128 @@ -5950,7 +5981,7 @@
  6.1129  set dummy $ac_prog; ac_word=$2
  6.1130  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1131  $as_echo_n "checking for $ac_word... " >&6; }
  6.1132 -if test "${ac_cv_prog_AWK+set}" = set; then :
  6.1133 +if ${ac_cv_prog_AWK+:} false; then :
  6.1134    $as_echo_n "(cached) " >&6
  6.1135  else
  6.1136    if test -n "$AWK"; then
  6.1137 @@ -5962,7 +5993,7 @@
  6.1138    IFS=$as_save_IFS
  6.1139    test -z "$as_dir" && as_dir=.
  6.1140      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1141 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1142 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1143      ac_cv_prog_AWK="$ac_prog"
  6.1144      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1145      break 2
  6.1146 @@ -6000,7 +6031,7 @@
  6.1147  
  6.1148  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  6.1149  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  6.1150 -if test "${ac_cv_path_GREP+set}" = set; then :
  6.1151 +if ${ac_cv_path_GREP+:} false; then :
  6.1152    $as_echo_n "(cached) " >&6
  6.1153  else
  6.1154    if test -z "$GREP"; then
  6.1155 @@ -6014,7 +6045,7 @@
  6.1156      for ac_prog in grep ggrep; do
  6.1157      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1158        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  6.1159 -      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  6.1160 +      as_fn_executable_p "$ac_path_GREP" || continue
  6.1161  # Check for GNU ac_path_GREP and select it if it is found.
  6.1162    # Check for GNU $ac_path_GREP
  6.1163  case `"$ac_path_GREP" --version 2>&1` in
  6.1164 @@ -6075,7 +6106,7 @@
  6.1165  
  6.1166  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  6.1167  $as_echo_n "checking for egrep... " >&6; }
  6.1168 -if test "${ac_cv_path_EGREP+set}" = set; then :
  6.1169 +if ${ac_cv_path_EGREP+:} false; then :
  6.1170    $as_echo_n "(cached) " >&6
  6.1171  else
  6.1172    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  6.1173 @@ -6092,7 +6123,7 @@
  6.1174      for ac_prog in egrep; do
  6.1175      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1176        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  6.1177 -      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  6.1178 +      as_fn_executable_p "$ac_path_EGREP" || continue
  6.1179  # Check for GNU ac_path_EGREP and select it if it is found.
  6.1180    # Check for GNU $ac_path_EGREP
  6.1181  case `"$ac_path_EGREP" --version 2>&1` in
  6.1182 @@ -6154,7 +6185,7 @@
  6.1183  
  6.1184  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  6.1185  $as_echo_n "checking for fgrep... " >&6; }
  6.1186 -if test "${ac_cv_path_FGREP+set}" = set; then :
  6.1187 +if ${ac_cv_path_FGREP+:} false; then :
  6.1188    $as_echo_n "(cached) " >&6
  6.1189  else
  6.1190    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
  6.1191 @@ -6171,7 +6202,7 @@
  6.1192      for ac_prog in fgrep; do
  6.1193      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1194        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
  6.1195 -      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
  6.1196 +      as_fn_executable_p "$ac_path_FGREP" || continue
  6.1197  # Check for GNU ac_path_FGREP and select it if it is found.
  6.1198    # Check for GNU $ac_path_FGREP
  6.1199  case `"$ac_path_FGREP" --version 2>&1` in
  6.1200 @@ -6233,7 +6264,7 @@
  6.1201  
  6.1202  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
  6.1203  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
  6.1204 -if test "${ac_cv_path_SED+set}" = set; then :
  6.1205 +if ${ac_cv_path_SED+:} false; then :
  6.1206    $as_echo_n "(cached) " >&6
  6.1207  else
  6.1208              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
  6.1209 @@ -6253,7 +6284,7 @@
  6.1210      for ac_prog in sed gsed; do
  6.1211      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1212        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
  6.1213 -      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
  6.1214 +      as_fn_executable_p "$ac_path_SED" || continue
  6.1215  # Check for GNU ac_path_SED and select it if it is found.
  6.1216    # Check for GNU $ac_path_SED
  6.1217  case `"$ac_path_SED" --version 2>&1` in
  6.1218 @@ -6319,7 +6350,7 @@
  6.1219  set dummy $ac_prog; ac_word=$2
  6.1220  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1221  $as_echo_n "checking for $ac_word... " >&6; }
  6.1222 -if test "${ac_cv_path_NAWK+set}" = set; then :
  6.1223 +if ${ac_cv_path_NAWK+:} false; then :
  6.1224    $as_echo_n "(cached) " >&6
  6.1225  else
  6.1226    case $NAWK in
  6.1227 @@ -6333,7 +6364,7 @@
  6.1228    IFS=$as_save_IFS
  6.1229    test -z "$as_dir" && as_dir=.
  6.1230      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1231 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1232 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1233      ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
  6.1234      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1235      break 2
  6.1236 @@ -6383,7 +6414,7 @@
  6.1237  set dummy cygpath; ac_word=$2
  6.1238  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1239  $as_echo_n "checking for $ac_word... " >&6; }
  6.1240 -if test "${ac_cv_path_CYGPATH+set}" = set; then :
  6.1241 +if ${ac_cv_path_CYGPATH+:} false; then :
  6.1242    $as_echo_n "(cached) " >&6
  6.1243  else
  6.1244    case $CYGPATH in
  6.1245 @@ -6397,7 +6428,7 @@
  6.1246    IFS=$as_save_IFS
  6.1247    test -z "$as_dir" && as_dir=.
  6.1248      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1249 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1250 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1251      ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
  6.1252      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1253      break 2
  6.1254 @@ -6423,7 +6454,7 @@
  6.1255  set dummy readlink; ac_word=$2
  6.1256  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1257  $as_echo_n "checking for $ac_word... " >&6; }
  6.1258 -if test "${ac_cv_path_READLINK+set}" = set; then :
  6.1259 +if ${ac_cv_path_READLINK+:} false; then :
  6.1260    $as_echo_n "(cached) " >&6
  6.1261  else
  6.1262    case $READLINK in
  6.1263 @@ -6437,7 +6468,7 @@
  6.1264    IFS=$as_save_IFS
  6.1265    test -z "$as_dir" && as_dir=.
  6.1266      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1267 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1268 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1269      ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
  6.1270      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1271      break 2
  6.1272 @@ -6463,7 +6494,7 @@
  6.1273  set dummy df; ac_word=$2
  6.1274  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1275  $as_echo_n "checking for $ac_word... " >&6; }
  6.1276 -if test "${ac_cv_path_DF+set}" = set; then :
  6.1277 +if ${ac_cv_path_DF+:} false; then :
  6.1278    $as_echo_n "(cached) " >&6
  6.1279  else
  6.1280    case $DF in
  6.1281 @@ -6477,7 +6508,7 @@
  6.1282    IFS=$as_save_IFS
  6.1283    test -z "$as_dir" && as_dir=.
  6.1284      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1285 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1286 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1287      ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
  6.1288      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1289      break 2
  6.1290 @@ -6503,7 +6534,7 @@
  6.1291  set dummy SetFile; ac_word=$2
  6.1292  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1293  $as_echo_n "checking for $ac_word... " >&6; }
  6.1294 -if test "${ac_cv_path_SETFILE+set}" = set; then :
  6.1295 +if ${ac_cv_path_SETFILE+:} false; then :
  6.1296    $as_echo_n "(cached) " >&6
  6.1297  else
  6.1298    case $SETFILE in
  6.1299 @@ -6517,7 +6548,7 @@
  6.1300    IFS=$as_save_IFS
  6.1301    test -z "$as_dir" && as_dir=.
  6.1302      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1303 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1304 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1305      ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext"
  6.1306      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1307      break 2
  6.1308 @@ -6549,7 +6580,7 @@
  6.1309  
  6.1310  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
  6.1311  $as_echo_n "checking build system type... " >&6; }
  6.1312 -if test "${ac_cv_build+set}" = set; then :
  6.1313 +if ${ac_cv_build+:} false; then :
  6.1314    $as_echo_n "(cached) " >&6
  6.1315  else
  6.1316    ac_build_alias=$build_alias
  6.1317 @@ -6565,7 +6596,7 @@
  6.1318  $as_echo "$ac_cv_build" >&6; }
  6.1319  case $ac_cv_build in
  6.1320  *-*-*) ;;
  6.1321 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
  6.1322 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
  6.1323  esac
  6.1324  build=$ac_cv_build
  6.1325  ac_save_IFS=$IFS; IFS='-'
  6.1326 @@ -6583,7 +6614,7 @@
  6.1327  
  6.1328  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
  6.1329  $as_echo_n "checking host system type... " >&6; }
  6.1330 -if test "${ac_cv_host+set}" = set; then :
  6.1331 +if ${ac_cv_host+:} false; then :
  6.1332    $as_echo_n "(cached) " >&6
  6.1333  else
  6.1334    if test "x$host_alias" = x; then
  6.1335 @@ -6598,7 +6629,7 @@
  6.1336  $as_echo "$ac_cv_host" >&6; }
  6.1337  case $ac_cv_host in
  6.1338  *-*-*) ;;
  6.1339 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
  6.1340 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
  6.1341  esac
  6.1342  host=$ac_cv_host
  6.1343  ac_save_IFS=$IFS; IFS='-'
  6.1344 @@ -6616,7 +6647,7 @@
  6.1345  
  6.1346  { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
  6.1347  $as_echo_n "checking target system type... " >&6; }
  6.1348 -if test "${ac_cv_target+set}" = set; then :
  6.1349 +if ${ac_cv_target+:} false; then :
  6.1350    $as_echo_n "(cached) " >&6
  6.1351  else
  6.1352    if test "x$target_alias" = x; then
  6.1353 @@ -6631,7 +6662,7 @@
  6.1354  $as_echo "$ac_cv_target" >&6; }
  6.1355  case $ac_cv_target in
  6.1356  *-*-*) ;;
  6.1357 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
  6.1358 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
  6.1359  esac
  6.1360  target=$ac_cv_target
  6.1361  ac_save_IFS=$IFS; IFS='-'
  6.1362 @@ -8157,7 +8188,7 @@
  6.1363  set dummy $ac_prog; ac_word=$2
  6.1364  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1365  $as_echo_n "checking for $ac_word... " >&6; }
  6.1366 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
  6.1367 +if ${ac_cv_prog_PKGHANDLER+:} false; then :
  6.1368    $as_echo_n "(cached) " >&6
  6.1369  else
  6.1370    if test -n "$PKGHANDLER"; then
  6.1371 @@ -8169,7 +8200,7 @@
  6.1372    IFS=$as_save_IFS
  6.1373    test -z "$as_dir" && as_dir=.
  6.1374      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1375 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1376 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1377      ac_cv_prog_PKGHANDLER="$ac_prog"
  6.1378      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1379      break 2
  6.1380 @@ -8522,7 +8553,7 @@
  6.1381  set dummy $ac_prog; ac_word=$2
  6.1382  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1383  $as_echo_n "checking for $ac_word... " >&6; }
  6.1384 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
  6.1385 +if ${ac_cv_path_CHECK_GMAKE+:} false; then :
  6.1386    $as_echo_n "(cached) " >&6
  6.1387  else
  6.1388    case $CHECK_GMAKE in
  6.1389 @@ -8536,7 +8567,7 @@
  6.1390    IFS=$as_save_IFS
  6.1391    test -z "$as_dir" && as_dir=.
  6.1392      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1393 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1394 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1395      ac_cv_path_CHECK_GMAKE="$as_dir/$ac_word$ac_exec_ext"
  6.1396      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1397      break 2
  6.1398 @@ -8876,7 +8907,7 @@
  6.1399  set dummy $ac_prog; ac_word=$2
  6.1400  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1401  $as_echo_n "checking for $ac_word... " >&6; }
  6.1402 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
  6.1403 +if ${ac_cv_path_CHECK_MAKE+:} false; then :
  6.1404    $as_echo_n "(cached) " >&6
  6.1405  else
  6.1406    case $CHECK_MAKE in
  6.1407 @@ -8890,7 +8921,7 @@
  6.1408    IFS=$as_save_IFS
  6.1409    test -z "$as_dir" && as_dir=.
  6.1410      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1411 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1412 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1413      ac_cv_path_CHECK_MAKE="$as_dir/$ac_word$ac_exec_ext"
  6.1414      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1415      break 2
  6.1416 @@ -9235,7 +9266,7 @@
  6.1417  set dummy $ac_prog; ac_word=$2
  6.1418  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1419  $as_echo_n "checking for $ac_word... " >&6; }
  6.1420 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
  6.1421 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
  6.1422    $as_echo_n "(cached) " >&6
  6.1423  else
  6.1424    case $CHECK_TOOLSDIR_GMAKE in
  6.1425 @@ -9249,7 +9280,7 @@
  6.1426    IFS=$as_save_IFS
  6.1427    test -z "$as_dir" && as_dir=.
  6.1428      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1429 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1430 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1431      ac_cv_path_CHECK_TOOLSDIR_GMAKE="$as_dir/$ac_word$ac_exec_ext"
  6.1432      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1433      break 2
  6.1434 @@ -9588,7 +9619,7 @@
  6.1435  set dummy $ac_prog; ac_word=$2
  6.1436  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1437  $as_echo_n "checking for $ac_word... " >&6; }
  6.1438 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
  6.1439 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
  6.1440    $as_echo_n "(cached) " >&6
  6.1441  else
  6.1442    case $CHECK_TOOLSDIR_MAKE in
  6.1443 @@ -9602,7 +9633,7 @@
  6.1444    IFS=$as_save_IFS
  6.1445    test -z "$as_dir" && as_dir=.
  6.1446      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1447 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1448 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1449      ac_cv_path_CHECK_TOOLSDIR_MAKE="$as_dir/$ac_word$ac_exec_ext"
  6.1450      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1451      break 2
  6.1452 @@ -9984,7 +10015,7 @@
  6.1453  set dummy $ac_prog; ac_word=$2
  6.1454  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1455  $as_echo_n "checking for $ac_word... " >&6; }
  6.1456 -if test "${ac_cv_path_UNZIP+set}" = set; then :
  6.1457 +if ${ac_cv_path_UNZIP+:} false; then :
  6.1458    $as_echo_n "(cached) " >&6
  6.1459  else
  6.1460    case $UNZIP in
  6.1461 @@ -9998,7 +10029,7 @@
  6.1462    IFS=$as_save_IFS
  6.1463    test -z "$as_dir" && as_dir=.
  6.1464      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1465 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1466 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1467      ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
  6.1468      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1469      break 2
  6.1470 @@ -10043,7 +10074,7 @@
  6.1471  set dummy $ac_prog; ac_word=$2
  6.1472  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1473  $as_echo_n "checking for $ac_word... " >&6; }
  6.1474 -if test "${ac_cv_path_ZIP+set}" = set; then :
  6.1475 +if ${ac_cv_path_ZIP+:} false; then :
  6.1476    $as_echo_n "(cached) " >&6
  6.1477  else
  6.1478    case $ZIP in
  6.1479 @@ -10057,7 +10088,7 @@
  6.1480    IFS=$as_save_IFS
  6.1481    test -z "$as_dir" && as_dir=.
  6.1482      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1483 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1484 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1485      ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
  6.1486      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1487      break 2
  6.1488 @@ -10102,7 +10133,7 @@
  6.1489  set dummy ldd; ac_word=$2
  6.1490  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1491  $as_echo_n "checking for $ac_word... " >&6; }
  6.1492 -if test "${ac_cv_path_LDD+set}" = set; then :
  6.1493 +if ${ac_cv_path_LDD+:} false; then :
  6.1494    $as_echo_n "(cached) " >&6
  6.1495  else
  6.1496    case $LDD in
  6.1497 @@ -10116,7 +10147,7 @@
  6.1498    IFS=$as_save_IFS
  6.1499    test -z "$as_dir" && as_dir=.
  6.1500      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1501 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1502 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1503      ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
  6.1504      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1505      break 2
  6.1506 @@ -10148,7 +10179,7 @@
  6.1507  set dummy otool; ac_word=$2
  6.1508  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1509  $as_echo_n "checking for $ac_word... " >&6; }
  6.1510 -if test "${ac_cv_path_OTOOL+set}" = set; then :
  6.1511 +if ${ac_cv_path_OTOOL+:} false; then :
  6.1512    $as_echo_n "(cached) " >&6
  6.1513  else
  6.1514    case $OTOOL in
  6.1515 @@ -10162,7 +10193,7 @@
  6.1516    IFS=$as_save_IFS
  6.1517    test -z "$as_dir" && as_dir=.
  6.1518      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1519 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1520 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1521      ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
  6.1522      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1523      break 2
  6.1524 @@ -10193,7 +10224,7 @@
  6.1525  set dummy $ac_prog; ac_word=$2
  6.1526  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1527  $as_echo_n "checking for $ac_word... " >&6; }
  6.1528 -if test "${ac_cv_path_READELF+set}" = set; then :
  6.1529 +if ${ac_cv_path_READELF+:} false; then :
  6.1530    $as_echo_n "(cached) " >&6
  6.1531  else
  6.1532    case $READELF in
  6.1533 @@ -10207,7 +10238,7 @@
  6.1534    IFS=$as_save_IFS
  6.1535    test -z "$as_dir" && as_dir=.
  6.1536      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1537 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1538 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1539      ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
  6.1540      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1541      break 2
  6.1542 @@ -10236,7 +10267,7 @@
  6.1543  set dummy hg; ac_word=$2
  6.1544  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1545  $as_echo_n "checking for $ac_word... " >&6; }
  6.1546 -if test "${ac_cv_path_HG+set}" = set; then :
  6.1547 +if ${ac_cv_path_HG+:} false; then :
  6.1548    $as_echo_n "(cached) " >&6
  6.1549  else
  6.1550    case $HG in
  6.1551 @@ -10250,7 +10281,7 @@
  6.1552    IFS=$as_save_IFS
  6.1553    test -z "$as_dir" && as_dir=.
  6.1554      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1555 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1556 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1557      ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
  6.1558      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1559      break 2
  6.1560 @@ -10276,7 +10307,7 @@
  6.1561  set dummy stat; ac_word=$2
  6.1562  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1563  $as_echo_n "checking for $ac_word... " >&6; }
  6.1564 -if test "${ac_cv_path_STAT+set}" = set; then :
  6.1565 +if ${ac_cv_path_STAT+:} false; then :
  6.1566    $as_echo_n "(cached) " >&6
  6.1567  else
  6.1568    case $STAT in
  6.1569 @@ -10290,7 +10321,7 @@
  6.1570    IFS=$as_save_IFS
  6.1571    test -z "$as_dir" && as_dir=.
  6.1572      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1573 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1574 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1575      ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext"
  6.1576      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1577      break 2
  6.1578 @@ -10316,7 +10347,7 @@
  6.1579  set dummy time; ac_word=$2
  6.1580  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1581  $as_echo_n "checking for $ac_word... " >&6; }
  6.1582 -if test "${ac_cv_path_TIME+set}" = set; then :
  6.1583 +if ${ac_cv_path_TIME+:} false; then :
  6.1584    $as_echo_n "(cached) " >&6
  6.1585  else
  6.1586    case $TIME in
  6.1587 @@ -10330,7 +10361,7 @@
  6.1588    IFS=$as_save_IFS
  6.1589    test -z "$as_dir" && as_dir=.
  6.1590      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1591 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1592 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1593      ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext"
  6.1594      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1595      break 2
  6.1596 @@ -10369,7 +10400,7 @@
  6.1597  set dummy $ac_prog; ac_word=$2
  6.1598  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1599  $as_echo_n "checking for $ac_word... " >&6; }
  6.1600 -if test "${ac_cv_path_COMM+set}" = set; then :
  6.1601 +if ${ac_cv_path_COMM+:} false; then :
  6.1602    $as_echo_n "(cached) " >&6
  6.1603  else
  6.1604    case $COMM in
  6.1605 @@ -10383,7 +10414,7 @@
  6.1606    IFS=$as_save_IFS
  6.1607    test -z "$as_dir" && as_dir=.
  6.1608      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1609 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1610 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1611      ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
  6.1612      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1613      break 2
  6.1614 @@ -10431,7 +10462,7 @@
  6.1615  set dummy $ac_prog; ac_word=$2
  6.1616  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1617  $as_echo_n "checking for $ac_word... " >&6; }
  6.1618 -if test "${ac_cv_path_XATTR+set}" = set; then :
  6.1619 +if ${ac_cv_path_XATTR+:} false; then :
  6.1620    $as_echo_n "(cached) " >&6
  6.1621  else
  6.1622    case $XATTR in
  6.1623 @@ -10445,7 +10476,7 @@
  6.1624    IFS=$as_save_IFS
  6.1625    test -z "$as_dir" && as_dir=.
  6.1626      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1627 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1628 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1629      ac_cv_path_XATTR="$as_dir/$ac_word$ac_exec_ext"
  6.1630      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1631      break 2
  6.1632 @@ -10487,7 +10518,7 @@
  6.1633  set dummy codesign; ac_word=$2
  6.1634  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1635  $as_echo_n "checking for $ac_word... " >&6; }
  6.1636 -if test "${ac_cv_path_CODESIGN+set}" = set; then :
  6.1637 +if ${ac_cv_path_CODESIGN+:} false; then :
  6.1638    $as_echo_n "(cached) " >&6
  6.1639  else
  6.1640    case $CODESIGN in
  6.1641 @@ -10501,7 +10532,7 @@
  6.1642    IFS=$as_save_IFS
  6.1643    test -z "$as_dir" && as_dir=.
  6.1644      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1645 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1646 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1647      ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
  6.1648      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1649      break 2
  6.1650 @@ -10551,7 +10582,7 @@
  6.1651  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  6.1652  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1653  $as_echo_n "checking for $ac_word... " >&6; }
  6.1654 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  6.1655 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
  6.1656    $as_echo_n "(cached) " >&6
  6.1657  else
  6.1658    case $PKG_CONFIG in
  6.1659 @@ -10565,7 +10596,7 @@
  6.1660    IFS=$as_save_IFS
  6.1661    test -z "$as_dir" && as_dir=.
  6.1662      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1663 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1664 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1665      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  6.1666      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1667      break 2
  6.1668 @@ -10594,7 +10625,7 @@
  6.1669  set dummy pkg-config; ac_word=$2
  6.1670  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1671  $as_echo_n "checking for $ac_word... " >&6; }
  6.1672 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
  6.1673 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
  6.1674    $as_echo_n "(cached) " >&6
  6.1675  else
  6.1676    case $ac_pt_PKG_CONFIG in
  6.1677 @@ -10608,7 +10639,7 @@
  6.1678    IFS=$as_save_IFS
  6.1679    test -z "$as_dir" && as_dir=.
  6.1680      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1681 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1682 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1683      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  6.1684      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1685      break 2
  6.1686 @@ -10767,7 +10798,7 @@
  6.1687  set dummy $ac_prog; ac_word=$2
  6.1688  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1689  $as_echo_n "checking for $ac_word... " >&6; }
  6.1690 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
  6.1691 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
  6.1692    $as_echo_n "(cached) " >&6
  6.1693  else
  6.1694    if test -n "$BDEPS_UNZIP"; then
  6.1695 @@ -10779,7 +10810,7 @@
  6.1696    IFS=$as_save_IFS
  6.1697    test -z "$as_dir" && as_dir=.
  6.1698      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1699 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1700 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1701      ac_cv_prog_BDEPS_UNZIP="$ac_prog"
  6.1702      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1703      break 2
  6.1704 @@ -10813,7 +10844,7 @@
  6.1705  set dummy $ac_prog; ac_word=$2
  6.1706  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1707  $as_echo_n "checking for $ac_word... " >&6; }
  6.1708 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
  6.1709 +if ${ac_cv_prog_BDEPS_FTP+:} false; then :
  6.1710    $as_echo_n "(cached) " >&6
  6.1711  else
  6.1712    if test -n "$BDEPS_FTP"; then
  6.1713 @@ -10825,7 +10856,7 @@
  6.1714    IFS=$as_save_IFS
  6.1715    test -z "$as_dir" && as_dir=.
  6.1716      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1717 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1718 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1719      ac_cv_prog_BDEPS_FTP="$ac_prog"
  6.1720      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1721      break 2
  6.1722 @@ -12109,7 +12140,7 @@
  6.1723  set dummy javac; ac_word=$2
  6.1724  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1725  $as_echo_n "checking for $ac_word... " >&6; }
  6.1726 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
  6.1727 +if ${ac_cv_path_JAVAC_CHECK+:} false; then :
  6.1728    $as_echo_n "(cached) " >&6
  6.1729  else
  6.1730    case $JAVAC_CHECK in
  6.1731 @@ -12123,7 +12154,7 @@
  6.1732    IFS=$as_save_IFS
  6.1733    test -z "$as_dir" && as_dir=.
  6.1734      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1735 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1736 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1737      ac_cv_path_JAVAC_CHECK="$as_dir/$ac_word$ac_exec_ext"
  6.1738      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1739      break 2
  6.1740 @@ -12149,7 +12180,7 @@
  6.1741  set dummy java; ac_word=$2
  6.1742  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1743  $as_echo_n "checking for $ac_word... " >&6; }
  6.1744 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
  6.1745 +if ${ac_cv_path_JAVA_CHECK+:} false; then :
  6.1746    $as_echo_n "(cached) " >&6
  6.1747  else
  6.1748    case $JAVA_CHECK in
  6.1749 @@ -12163,7 +12194,7 @@
  6.1750    IFS=$as_save_IFS
  6.1751    test -z "$as_dir" && as_dir=.
  6.1752      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1753 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1754 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1755      ac_cv_path_JAVA_CHECK="$as_dir/$ac_word$ac_exec_ext"
  6.1756      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1757      break 2
  6.1758 @@ -16478,7 +16509,7 @@
  6.1759  set dummy $ac_prog; ac_word=$2
  6.1760  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1761  $as_echo_n "checking for $ac_word... " >&6; }
  6.1762 -if test "${ac_cv_path_JTREGEXE+set}" = set; then :
  6.1763 +if ${ac_cv_path_JTREGEXE+:} false; then :
  6.1764    $as_echo_n "(cached) " >&6
  6.1765  else
  6.1766    case $JTREGEXE in
  6.1767 @@ -16492,7 +16523,7 @@
  6.1768    IFS=$as_save_IFS
  6.1769    test -z "$as_dir" && as_dir=.
  6.1770      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1771 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1772 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1773      ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
  6.1774      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1775      break 2
  6.1776 @@ -16546,7 +16577,7 @@
  6.1777  set dummy link; ac_word=$2
  6.1778  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1779  $as_echo_n "checking for $ac_word... " >&6; }
  6.1780 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
  6.1781 +if ${ac_cv_path_CYGWIN_LINK+:} false; then :
  6.1782    $as_echo_n "(cached) " >&6
  6.1783  else
  6.1784    case $CYGWIN_LINK in
  6.1785 @@ -16560,7 +16591,7 @@
  6.1786    IFS=$as_save_IFS
  6.1787    test -z "$as_dir" && as_dir=.
  6.1788      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1789 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1790 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1791      ac_cv_path_CYGWIN_LINK="$as_dir/$ac_word$ac_exec_ext"
  6.1792      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1793      break 2
  6.1794 @@ -17989,7 +18020,7 @@
  6.1795  set dummy $ac_prog; ac_word=$2
  6.1796  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1797  $as_echo_n "checking for $ac_word... " >&6; }
  6.1798 -if test "${ac_cv_path_BUILD_CC+set}" = set; then :
  6.1799 +if ${ac_cv_path_BUILD_CC+:} false; then :
  6.1800    $as_echo_n "(cached) " >&6
  6.1801  else
  6.1802    case $BUILD_CC in
  6.1803 @@ -18003,7 +18034,7 @@
  6.1804    IFS=$as_save_IFS
  6.1805    test -z "$as_dir" && as_dir=.
  6.1806      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1807 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1808 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1809      ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
  6.1810      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1811      break 2
  6.1812 @@ -18300,7 +18331,7 @@
  6.1813  set dummy $ac_prog; ac_word=$2
  6.1814  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1815  $as_echo_n "checking for $ac_word... " >&6; }
  6.1816 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
  6.1817 +if ${ac_cv_path_BUILD_CXX+:} false; then :
  6.1818    $as_echo_n "(cached) " >&6
  6.1819  else
  6.1820    case $BUILD_CXX in
  6.1821 @@ -18314,7 +18345,7 @@
  6.1822    IFS=$as_save_IFS
  6.1823    test -z "$as_dir" && as_dir=.
  6.1824      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1825 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1826 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1827      ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
  6.1828      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1829      break 2
  6.1830 @@ -18609,7 +18640,7 @@
  6.1831  set dummy ld; ac_word=$2
  6.1832  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1833  $as_echo_n "checking for $ac_word... " >&6; }
  6.1834 -if test "${ac_cv_path_BUILD_LD+set}" = set; then :
  6.1835 +if ${ac_cv_path_BUILD_LD+:} false; then :
  6.1836    $as_echo_n "(cached) " >&6
  6.1837  else
  6.1838    case $BUILD_LD in
  6.1839 @@ -18623,7 +18654,7 @@
  6.1840    IFS=$as_save_IFS
  6.1841    test -z "$as_dir" && as_dir=.
  6.1842      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1843 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1844 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1845      ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
  6.1846      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1847      break 2
  6.1848 @@ -19116,7 +19147,7 @@
  6.1849  set dummy $ac_prog; ac_word=$2
  6.1850  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1851  $as_echo_n "checking for $ac_word... " >&6; }
  6.1852 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
  6.1853 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
  6.1854    $as_echo_n "(cached) " >&6
  6.1855  else
  6.1856    case $TOOLS_DIR_CC in
  6.1857 @@ -19130,7 +19161,7 @@
  6.1858    IFS=$as_save_IFS
  6.1859    test -z "$as_dir" && as_dir=.
  6.1860      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1861 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1862 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1863      ac_cv_path_TOOLS_DIR_CC="$as_dir/$ac_word$ac_exec_ext"
  6.1864      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1865      break 2
  6.1866 @@ -19168,7 +19199,7 @@
  6.1867  set dummy $ac_prog; ac_word=$2
  6.1868  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1869  $as_echo_n "checking for $ac_word... " >&6; }
  6.1870 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
  6.1871 +if ${ac_cv_path_POTENTIAL_CC+:} false; then :
  6.1872    $as_echo_n "(cached) " >&6
  6.1873  else
  6.1874    case $POTENTIAL_CC in
  6.1875 @@ -19182,7 +19213,7 @@
  6.1876    IFS=$as_save_IFS
  6.1877    test -z "$as_dir" && as_dir=.
  6.1878      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1879 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1880 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1881      ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext"
  6.1882      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1883      break 2
  6.1884 @@ -19581,7 +19612,7 @@
  6.1885  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.1886  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1887  $as_echo_n "checking for $ac_word... " >&6; }
  6.1888 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
  6.1889 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
  6.1890    $as_echo_n "(cached) " >&6
  6.1891  else
  6.1892    if test -n "$PROPER_COMPILER_CC"; then
  6.1893 @@ -19593,7 +19624,7 @@
  6.1894    IFS=$as_save_IFS
  6.1895    test -z "$as_dir" && as_dir=.
  6.1896      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1897 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1898 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1899      ac_cv_prog_PROPER_COMPILER_CC="$ac_tool_prefix$ac_prog"
  6.1900      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1901      break 2
  6.1902 @@ -19625,7 +19656,7 @@
  6.1903  set dummy $ac_prog; ac_word=$2
  6.1904  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1905  $as_echo_n "checking for $ac_word... " >&6; }
  6.1906 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
  6.1907 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
  6.1908    $as_echo_n "(cached) " >&6
  6.1909  else
  6.1910    if test -n "$ac_ct_PROPER_COMPILER_CC"; then
  6.1911 @@ -19637,7 +19668,7 @@
  6.1912    IFS=$as_save_IFS
  6.1913    test -z "$as_dir" && as_dir=.
  6.1914      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1915 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1916 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1917      ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_prog"
  6.1918      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1919      break 2
  6.1920 @@ -20075,7 +20106,7 @@
  6.1921  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.1922  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1923  $as_echo_n "checking for $ac_word... " >&6; }
  6.1924 -if test "${ac_cv_prog_CC+set}" = set; then :
  6.1925 +if ${ac_cv_prog_CC+:} false; then :
  6.1926    $as_echo_n "(cached) " >&6
  6.1927  else
  6.1928    if test -n "$CC"; then
  6.1929 @@ -20087,7 +20118,7 @@
  6.1930    IFS=$as_save_IFS
  6.1931    test -z "$as_dir" && as_dir=.
  6.1932      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1933 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1934 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1935      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
  6.1936      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1937      break 2
  6.1938 @@ -20119,7 +20150,7 @@
  6.1939  set dummy $ac_prog; ac_word=$2
  6.1940  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.1941  $as_echo_n "checking for $ac_word... " >&6; }
  6.1942 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  6.1943 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  6.1944    $as_echo_n "(cached) " >&6
  6.1945  else
  6.1946    if test -n "$ac_ct_CC"; then
  6.1947 @@ -20131,7 +20162,7 @@
  6.1948    IFS=$as_save_IFS
  6.1949    test -z "$as_dir" && as_dir=.
  6.1950      for ac_exec_ext in '' $ac_executable_extensions; do
  6.1951 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1952 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.1953      ac_cv_prog_ac_ct_CC="$ac_prog"
  6.1954      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1955      break 2
  6.1956 @@ -20172,7 +20203,7 @@
  6.1957  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.1958  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1959  as_fn_error $? "no acceptable C compiler found in \$PATH
  6.1960 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.1961 +See \`config.log' for more details" "$LINENO" 5; }
  6.1962  
  6.1963  # Provide some information about the compiler.
  6.1964  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  6.1965 @@ -20287,7 +20318,7 @@
  6.1966  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.1967  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1968  as_fn_error 77 "C compiler cannot create executables
  6.1969 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.1970 +See \`config.log' for more details" "$LINENO" 5; }
  6.1971  else
  6.1972    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  6.1973  $as_echo "yes" >&6; }
  6.1974 @@ -20330,7 +20361,7 @@
  6.1975    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.1976  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1977  as_fn_error $? "cannot compute suffix of executables: cannot compile and link
  6.1978 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.1979 +See \`config.log' for more details" "$LINENO" 5; }
  6.1980  fi
  6.1981  rm -f conftest conftest$ac_cv_exeext
  6.1982  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  6.1983 @@ -20389,7 +20420,7 @@
  6.1984  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1985  as_fn_error $? "cannot run C compiled programs.
  6.1986  If you meant to cross compile, use \`--host'.
  6.1987 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.1988 +See \`config.log' for more details" "$LINENO" 5; }
  6.1989      fi
  6.1990    fi
  6.1991  fi
  6.1992 @@ -20400,7 +20431,7 @@
  6.1993  ac_clean_files=$ac_clean_files_save
  6.1994  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  6.1995  $as_echo_n "checking for suffix of object files... " >&6; }
  6.1996 -if test "${ac_cv_objext+set}" = set; then :
  6.1997 +if ${ac_cv_objext+:} false; then :
  6.1998    $as_echo_n "(cached) " >&6
  6.1999  else
  6.2000    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6.2001 @@ -20441,7 +20472,7 @@
  6.2002  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.2003  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.2004  as_fn_error $? "cannot compute suffix of object files: cannot compile
  6.2005 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.2006 +See \`config.log' for more details" "$LINENO" 5; }
  6.2007  fi
  6.2008  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  6.2009  fi
  6.2010 @@ -20451,7 +20482,7 @@
  6.2011  ac_objext=$OBJEXT
  6.2012  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  6.2013  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  6.2014 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  6.2015 +if ${ac_cv_c_compiler_gnu+:} false; then :
  6.2016    $as_echo_n "(cached) " >&6
  6.2017  else
  6.2018    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6.2019 @@ -20488,7 +20519,7 @@
  6.2020  ac_save_CFLAGS=$CFLAGS
  6.2021  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  6.2022  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  6.2023 -if test "${ac_cv_prog_cc_g+set}" = set; then :
  6.2024 +if ${ac_cv_prog_cc_g+:} false; then :
  6.2025    $as_echo_n "(cached) " >&6
  6.2026  else
  6.2027    ac_save_c_werror_flag=$ac_c_werror_flag
  6.2028 @@ -20566,7 +20597,7 @@
  6.2029  fi
  6.2030  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  6.2031  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  6.2032 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
  6.2033 +if ${ac_cv_prog_cc_c89+:} false; then :
  6.2034    $as_echo_n "(cached) " >&6
  6.2035  else
  6.2036    ac_cv_prog_cc_c89=no
  6.2037 @@ -20575,8 +20606,7 @@
  6.2038  /* end confdefs.h.  */
  6.2039  #include <stdarg.h>
  6.2040  #include <stdio.h>
  6.2041 -#include <sys/types.h>
  6.2042 -#include <sys/stat.h>
  6.2043 +struct stat;
  6.2044  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  6.2045  struct buf { int x; };
  6.2046  FILE * (*rcsopen) (struct buf *, struct stat *, int);
  6.2047 @@ -20689,7 +20719,7 @@
  6.2048  set dummy $ac_prog; ac_word=$2
  6.2049  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2050  $as_echo_n "checking for $ac_word... " >&6; }
  6.2051 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
  6.2052 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
  6.2053    $as_echo_n "(cached) " >&6
  6.2054  else
  6.2055    case $TOOLS_DIR_CXX in
  6.2056 @@ -20703,7 +20733,7 @@
  6.2057    IFS=$as_save_IFS
  6.2058    test -z "$as_dir" && as_dir=.
  6.2059      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2060 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2061 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2062      ac_cv_path_TOOLS_DIR_CXX="$as_dir/$ac_word$ac_exec_ext"
  6.2063      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2064      break 2
  6.2065 @@ -20741,7 +20771,7 @@
  6.2066  set dummy $ac_prog; ac_word=$2
  6.2067  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2068  $as_echo_n "checking for $ac_word... " >&6; }
  6.2069 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
  6.2070 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
  6.2071    $as_echo_n "(cached) " >&6
  6.2072  else
  6.2073    case $POTENTIAL_CXX in
  6.2074 @@ -20755,7 +20785,7 @@
  6.2075    IFS=$as_save_IFS
  6.2076    test -z "$as_dir" && as_dir=.
  6.2077      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2078 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2079 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2080      ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext"
  6.2081      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2082      break 2
  6.2083 @@ -21154,7 +21184,7 @@
  6.2084  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.2085  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2086  $as_echo_n "checking for $ac_word... " >&6; }
  6.2087 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
  6.2088 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
  6.2089    $as_echo_n "(cached) " >&6
  6.2090  else
  6.2091    if test -n "$PROPER_COMPILER_CXX"; then
  6.2092 @@ -21166,7 +21196,7 @@
  6.2093    IFS=$as_save_IFS
  6.2094    test -z "$as_dir" && as_dir=.
  6.2095      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2096 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2097 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2098      ac_cv_prog_PROPER_COMPILER_CXX="$ac_tool_prefix$ac_prog"
  6.2099      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2100      break 2
  6.2101 @@ -21198,7 +21228,7 @@
  6.2102  set dummy $ac_prog; ac_word=$2
  6.2103  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2104  $as_echo_n "checking for $ac_word... " >&6; }
  6.2105 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
  6.2106 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
  6.2107    $as_echo_n "(cached) " >&6
  6.2108  else
  6.2109    if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
  6.2110 @@ -21210,7 +21240,7 @@
  6.2111    IFS=$as_save_IFS
  6.2112    test -z "$as_dir" && as_dir=.
  6.2113      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2114 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2115 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2116      ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_prog"
  6.2117      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2118      break 2
  6.2119 @@ -21652,7 +21682,7 @@
  6.2120  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.2121  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2122  $as_echo_n "checking for $ac_word... " >&6; }
  6.2123 -if test "${ac_cv_prog_CXX+set}" = set; then :
  6.2124 +if ${ac_cv_prog_CXX+:} false; then :
  6.2125    $as_echo_n "(cached) " >&6
  6.2126  else
  6.2127    if test -n "$CXX"; then
  6.2128 @@ -21664,7 +21694,7 @@
  6.2129    IFS=$as_save_IFS
  6.2130    test -z "$as_dir" && as_dir=.
  6.2131      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2132 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2133 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2134      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
  6.2135      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2136      break 2
  6.2137 @@ -21696,7 +21726,7 @@
  6.2138  set dummy $ac_prog; ac_word=$2
  6.2139  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2140  $as_echo_n "checking for $ac_word... " >&6; }
  6.2141 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  6.2142 +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  6.2143    $as_echo_n "(cached) " >&6
  6.2144  else
  6.2145    if test -n "$ac_ct_CXX"; then
  6.2146 @@ -21708,7 +21738,7 @@
  6.2147    IFS=$as_save_IFS
  6.2148    test -z "$as_dir" && as_dir=.
  6.2149      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2150 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2151 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2152      ac_cv_prog_ac_ct_CXX="$ac_prog"
  6.2153      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2154      break 2
  6.2155 @@ -21774,7 +21804,7 @@
  6.2156  
  6.2157  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  6.2158  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  6.2159 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  6.2160 +if ${ac_cv_cxx_compiler_gnu+:} false; then :
  6.2161    $as_echo_n "(cached) " >&6
  6.2162  else
  6.2163    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6.2164 @@ -21811,7 +21841,7 @@
  6.2165  ac_save_CXXFLAGS=$CXXFLAGS
  6.2166  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  6.2167  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  6.2168 -if test "${ac_cv_prog_cxx_g+set}" = set; then :
  6.2169 +if ${ac_cv_prog_cxx_g+:} false; then :
  6.2170    $as_echo_n "(cached) " >&6
  6.2171  else
  6.2172    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  6.2173 @@ -21909,7 +21939,7 @@
  6.2174  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.2175  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2176  $as_echo_n "checking for $ac_word... " >&6; }
  6.2177 -if test "${ac_cv_prog_OBJC+set}" = set; then :
  6.2178 +if ${ac_cv_prog_OBJC+:} false; then :
  6.2179    $as_echo_n "(cached) " >&6
  6.2180  else
  6.2181    if test -n "$OBJC"; then
  6.2182 @@ -21921,7 +21951,7 @@
  6.2183    IFS=$as_save_IFS
  6.2184    test -z "$as_dir" && as_dir=.
  6.2185      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2186 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2187 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2188      ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
  6.2189      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2190      break 2
  6.2191 @@ -21953,7 +21983,7 @@
  6.2192  set dummy $ac_prog; ac_word=$2
  6.2193  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2194  $as_echo_n "checking for $ac_word... " >&6; }
  6.2195 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
  6.2196 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
  6.2197    $as_echo_n "(cached) " >&6
  6.2198  else
  6.2199    if test -n "$ac_ct_OBJC"; then
  6.2200 @@ -21965,7 +21995,7 @@
  6.2201    IFS=$as_save_IFS
  6.2202    test -z "$as_dir" && as_dir=.
  6.2203      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2204 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2205 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2206      ac_cv_prog_ac_ct_OBJC="$ac_prog"
  6.2207      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2208      break 2
  6.2209 @@ -22029,7 +22059,7 @@
  6.2210  
  6.2211  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
  6.2212  $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
  6.2213 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
  6.2214 +if ${ac_cv_objc_compiler_gnu+:} false; then :
  6.2215    $as_echo_n "(cached) " >&6
  6.2216  else
  6.2217    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6.2218 @@ -22066,7 +22096,7 @@
  6.2219  ac_save_OBJCFLAGS=$OBJCFLAGS
  6.2220  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
  6.2221  $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
  6.2222 -if test "${ac_cv_prog_objc_g+set}" = set; then :
  6.2223 +if ${ac_cv_prog_objc_g+:} false; then :
  6.2224    $as_echo_n "(cached) " >&6
  6.2225  else
  6.2226    ac_save_objc_werror_flag=$ac_objc_werror_flag
  6.2227 @@ -22442,7 +22472,7 @@
  6.2228  set dummy ${ac_tool_prefix}ar; ac_word=$2
  6.2229  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2230  $as_echo_n "checking for $ac_word... " >&6; }
  6.2231 -if test "${ac_cv_prog_AR+set}" = set; then :
  6.2232 +if ${ac_cv_prog_AR+:} false; then :
  6.2233    $as_echo_n "(cached) " >&6
  6.2234  else
  6.2235    if test -n "$AR"; then
  6.2236 @@ -22454,7 +22484,7 @@
  6.2237    IFS=$as_save_IFS
  6.2238    test -z "$as_dir" && as_dir=.
  6.2239      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2240 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2241 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2242      ac_cv_prog_AR="${ac_tool_prefix}ar"
  6.2243      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2244      break 2
  6.2245 @@ -22482,7 +22512,7 @@
  6.2246  set dummy ar; ac_word=$2
  6.2247  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2248  $as_echo_n "checking for $ac_word... " >&6; }
  6.2249 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
  6.2250 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
  6.2251    $as_echo_n "(cached) " >&6
  6.2252  else
  6.2253    if test -n "$ac_ct_AR"; then
  6.2254 @@ -22494,7 +22524,7 @@
  6.2255    IFS=$as_save_IFS
  6.2256    test -z "$as_dir" && as_dir=.
  6.2257      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2258 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2259 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2260      ac_cv_prog_ac_ct_AR="ar"
  6.2261      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2262      break 2
  6.2263 @@ -22824,7 +22854,7 @@
  6.2264  set dummy link; ac_word=$2
  6.2265  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2266  $as_echo_n "checking for $ac_word... " >&6; }
  6.2267 -if test "${ac_cv_prog_WINLD+set}" = set; then :
  6.2268 +if ${ac_cv_prog_WINLD+:} false; then :
  6.2269    $as_echo_n "(cached) " >&6
  6.2270  else
  6.2271    if test -n "$WINLD"; then
  6.2272 @@ -22837,7 +22867,7 @@
  6.2273    IFS=$as_save_IFS
  6.2274    test -z "$as_dir" && as_dir=.
  6.2275      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2276 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2277 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2278      if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then
  6.2279         ac_prog_rejected=yes
  6.2280         continue
  6.2281 @@ -23163,7 +23193,7 @@
  6.2282  set dummy mt; ac_word=$2
  6.2283  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2284  $as_echo_n "checking for $ac_word... " >&6; }
  6.2285 -if test "${ac_cv_prog_MT+set}" = set; then :
  6.2286 +if ${ac_cv_prog_MT+:} false; then :
  6.2287    $as_echo_n "(cached) " >&6
  6.2288  else
  6.2289    if test -n "$MT"; then
  6.2290 @@ -23176,7 +23206,7 @@
  6.2291    IFS=$as_save_IFS
  6.2292    test -z "$as_dir" && as_dir=.
  6.2293      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2294 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2295 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2296      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then
  6.2297         ac_prog_rejected=yes
  6.2298         continue
  6.2299 @@ -23484,7 +23514,7 @@
  6.2300  set dummy rc; ac_word=$2
  6.2301  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2302  $as_echo_n "checking for $ac_word... " >&6; }
  6.2303 -if test "${ac_cv_prog_RC+set}" = set; then :
  6.2304 +if ${ac_cv_prog_RC+:} false; then :
  6.2305    $as_echo_n "(cached) " >&6
  6.2306  else
  6.2307    if test -n "$RC"; then
  6.2308 @@ -23497,7 +23527,7 @@
  6.2309    IFS=$as_save_IFS
  6.2310    test -z "$as_dir" && as_dir=.
  6.2311      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2312 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2313 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2314      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then
  6.2315         ac_prog_rejected=yes
  6.2316         continue
  6.2317 @@ -23876,7 +23906,7 @@
  6.2318  set dummy lib; ac_word=$2
  6.2319  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2320  $as_echo_n "checking for $ac_word... " >&6; }
  6.2321 -if test "${ac_cv_prog_WINAR+set}" = set; then :
  6.2322 +if ${ac_cv_prog_WINAR+:} false; then :
  6.2323    $as_echo_n "(cached) " >&6
  6.2324  else
  6.2325    if test -n "$WINAR"; then
  6.2326 @@ -23888,7 +23918,7 @@
  6.2327    IFS=$as_save_IFS
  6.2328    test -z "$as_dir" && as_dir=.
  6.2329      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2330 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2331 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2332      ac_cv_prog_WINAR="lib"
  6.2333      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2334      break 2
  6.2335 @@ -24182,7 +24212,7 @@
  6.2336  set dummy dumpbin; ac_word=$2
  6.2337  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2338  $as_echo_n "checking for $ac_word... " >&6; }
  6.2339 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
  6.2340 +if ${ac_cv_prog_DUMPBIN+:} false; then :
  6.2341    $as_echo_n "(cached) " >&6
  6.2342  else
  6.2343    if test -n "$DUMPBIN"; then
  6.2344 @@ -24194,7 +24224,7 @@
  6.2345    IFS=$as_save_IFS
  6.2346    test -z "$as_dir" && as_dir=.
  6.2347      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2348 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2349 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2350      ac_cv_prog_DUMPBIN="dumpbin"
  6.2351      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2352      break 2
  6.2353 @@ -24501,7 +24531,7 @@
  6.2354    CPP=
  6.2355  fi
  6.2356  if test -z "$CPP"; then
  6.2357 -  if test "${ac_cv_prog_CPP+set}" = set; then :
  6.2358 +  if ${ac_cv_prog_CPP+:} false; then :
  6.2359    $as_echo_n "(cached) " >&6
  6.2360  else
  6.2361        # Double quotes because CPP needs to be expanded
  6.2362 @@ -24617,7 +24647,7 @@
  6.2363    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.2364  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.2365  as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  6.2366 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.2367 +See \`config.log' for more details" "$LINENO" 5; }
  6.2368  fi
  6.2369  
  6.2370  ac_ext=cpp
  6.2371 @@ -24901,7 +24931,7 @@
  6.2372  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
  6.2373  $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
  6.2374  if test -z "$CXXCPP"; then
  6.2375 -  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
  6.2376 +  if ${ac_cv_prog_CXXCPP+:} false; then :
  6.2377    $as_echo_n "(cached) " >&6
  6.2378  else
  6.2379        # Double quotes because CXXCPP needs to be expanded
  6.2380 @@ -25017,7 +25047,7 @@
  6.2381    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.2382  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.2383  as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
  6.2384 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.2385 +See \`config.log' for more details" "$LINENO" 5; }
  6.2386  fi
  6.2387  
  6.2388  ac_ext=cpp
  6.2389 @@ -25319,7 +25349,7 @@
  6.2390  set dummy as; ac_word=$2
  6.2391  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2392  $as_echo_n "checking for $ac_word... " >&6; }
  6.2393 -if test "${ac_cv_path_AS+set}" = set; then :
  6.2394 +if ${ac_cv_path_AS+:} false; then :
  6.2395    $as_echo_n "(cached) " >&6
  6.2396  else
  6.2397    case $AS in
  6.2398 @@ -25333,7 +25363,7 @@
  6.2399    IFS=$as_save_IFS
  6.2400    test -z "$as_dir" && as_dir=.
  6.2401      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2402 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2403 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2404      ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
  6.2405      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2406      break 2
  6.2407 @@ -25631,7 +25661,7 @@
  6.2408  set dummy nm; ac_word=$2
  6.2409  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2410  $as_echo_n "checking for $ac_word... " >&6; }
  6.2411 -if test "${ac_cv_path_NM+set}" = set; then :
  6.2412 +if ${ac_cv_path_NM+:} false; then :
  6.2413    $as_echo_n "(cached) " >&6
  6.2414  else
  6.2415    case $NM in
  6.2416 @@ -25645,7 +25675,7 @@
  6.2417    IFS=$as_save_IFS
  6.2418    test -z "$as_dir" && as_dir=.
  6.2419      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2420 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2421 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2422      ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
  6.2423      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2424      break 2
  6.2425 @@ -25937,7 +25967,7 @@
  6.2426  set dummy gnm; ac_word=$2
  6.2427  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2428  $as_echo_n "checking for $ac_word... " >&6; }
  6.2429 -if test "${ac_cv_path_GNM+set}" = set; then :
  6.2430 +if ${ac_cv_path_GNM+:} false; then :
  6.2431    $as_echo_n "(cached) " >&6
  6.2432  else
  6.2433    case $GNM in
  6.2434 @@ -25951,7 +25981,7 @@
  6.2435    IFS=$as_save_IFS
  6.2436    test -z "$as_dir" && as_dir=.
  6.2437      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2438 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2439 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2440      ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
  6.2441      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2442      break 2
  6.2443 @@ -26243,7 +26273,7 @@
  6.2444  set dummy strip; ac_word=$2
  6.2445  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2446  $as_echo_n "checking for $ac_word... " >&6; }
  6.2447 -if test "${ac_cv_path_STRIP+set}" = set; then :
  6.2448 +if ${ac_cv_path_STRIP+:} false; then :
  6.2449    $as_echo_n "(cached) " >&6
  6.2450  else
  6.2451    case $STRIP in
  6.2452 @@ -26257,7 +26287,7 @@
  6.2453    IFS=$as_save_IFS
  6.2454    test -z "$as_dir" && as_dir=.
  6.2455      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2456 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2457 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2458      ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
  6.2459      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2460      break 2
  6.2461 @@ -26549,7 +26579,7 @@
  6.2462  set dummy mcs; ac_word=$2
  6.2463  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2464  $as_echo_n "checking for $ac_word... " >&6; }
  6.2465 -if test "${ac_cv_path_MCS+set}" = set; then :
  6.2466 +if ${ac_cv_path_MCS+:} false; then :
  6.2467    $as_echo_n "(cached) " >&6
  6.2468  else
  6.2469    case $MCS in
  6.2470 @@ -26563,7 +26593,7 @@
  6.2471    IFS=$as_save_IFS
  6.2472    test -z "$as_dir" && as_dir=.
  6.2473      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2474 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2475 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2476      ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
  6.2477      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2478      break 2
  6.2479 @@ -26857,7 +26887,7 @@
  6.2480  set dummy ${ac_tool_prefix}nm; ac_word=$2
  6.2481  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2482  $as_echo_n "checking for $ac_word... " >&6; }
  6.2483 -if test "${ac_cv_prog_NM+set}" = set; then :
  6.2484 +if ${ac_cv_prog_NM+:} false; then :
  6.2485    $as_echo_n "(cached) " >&6
  6.2486  else
  6.2487    if test -n "$NM"; then
  6.2488 @@ -26869,7 +26899,7 @@
  6.2489    IFS=$as_save_IFS
  6.2490    test -z "$as_dir" && as_dir=.
  6.2491      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2492 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2493 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2494      ac_cv_prog_NM="${ac_tool_prefix}nm"
  6.2495      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2496      break 2
  6.2497 @@ -26897,7 +26927,7 @@
  6.2498  set dummy nm; ac_word=$2
  6.2499  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2500  $as_echo_n "checking for $ac_word... " >&6; }
  6.2501 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
  6.2502 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
  6.2503    $as_echo_n "(cached) " >&6
  6.2504  else
  6.2505    if test -n "$ac_ct_NM"; then
  6.2506 @@ -26909,7 +26939,7 @@
  6.2507    IFS=$as_save_IFS
  6.2508    test -z "$as_dir" && as_dir=.
  6.2509      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2510 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2511 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2512      ac_cv_prog_ac_ct_NM="nm"
  6.2513      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2514      break 2
  6.2515 @@ -27217,7 +27247,7 @@
  6.2516  set dummy ${ac_tool_prefix}strip; ac_word=$2
  6.2517  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2518  $as_echo_n "checking for $ac_word... " >&6; }
  6.2519 -if test "${ac_cv_prog_STRIP+set}" = set; then :
  6.2520 +if ${ac_cv_prog_STRIP+:} false; then :
  6.2521    $as_echo_n "(cached) " >&6
  6.2522  else
  6.2523    if test -n "$STRIP"; then
  6.2524 @@ -27229,7 +27259,7 @@
  6.2525    IFS=$as_save_IFS
  6.2526    test -z "$as_dir" && as_dir=.
  6.2527      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2528 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2529 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2530      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  6.2531      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2532      break 2
  6.2533 @@ -27257,7 +27287,7 @@
  6.2534  set dummy strip; ac_word=$2
  6.2535  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2536  $as_echo_n "checking for $ac_word... " >&6; }
  6.2537 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  6.2538 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  6.2539    $as_echo_n "(cached) " >&6
  6.2540  else
  6.2541    if test -n "$ac_ct_STRIP"; then
  6.2542 @@ -27269,7 +27299,7 @@
  6.2543    IFS=$as_save_IFS
  6.2544    test -z "$as_dir" && as_dir=.
  6.2545      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2546 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2547 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2548      ac_cv_prog_ac_ct_STRIP="strip"
  6.2549      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2550      break 2
  6.2551 @@ -27582,7 +27612,7 @@
  6.2552  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.2553  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2554  $as_echo_n "checking for $ac_word... " >&6; }
  6.2555 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
  6.2556 +if ${ac_cv_prog_OBJCOPY+:} false; then :
  6.2557    $as_echo_n "(cached) " >&6
  6.2558  else
  6.2559    if test -n "$OBJCOPY"; then
  6.2560 @@ -27594,7 +27624,7 @@
  6.2561    IFS=$as_save_IFS
  6.2562    test -z "$as_dir" && as_dir=.
  6.2563      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2564 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2565 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2566      ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
  6.2567      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2568      break 2
  6.2569 @@ -27626,7 +27656,7 @@
  6.2570  set dummy $ac_prog; ac_word=$2
  6.2571  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2572  $as_echo_n "checking for $ac_word... " >&6; }
  6.2573 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
  6.2574 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
  6.2575    $as_echo_n "(cached) " >&6
  6.2576  else
  6.2577    if test -n "$ac_ct_OBJCOPY"; then
  6.2578 @@ -27638,7 +27668,7 @@
  6.2579    IFS=$as_save_IFS
  6.2580    test -z "$as_dir" && as_dir=.
  6.2581      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2582 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2583 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2584      ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
  6.2585      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2586      break 2
  6.2587 @@ -27953,7 +27983,7 @@
  6.2588  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.2589  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2590  $as_echo_n "checking for $ac_word... " >&6; }
  6.2591 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  6.2592 +if ${ac_cv_prog_OBJDUMP+:} false; then :
  6.2593    $as_echo_n "(cached) " >&6
  6.2594  else
  6.2595    if test -n "$OBJDUMP"; then
  6.2596 @@ -27965,7 +27995,7 @@
  6.2597    IFS=$as_save_IFS
  6.2598    test -z "$as_dir" && as_dir=.
  6.2599      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2600 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2601 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2602      ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
  6.2603      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2604      break 2
  6.2605 @@ -27997,7 +28027,7 @@
  6.2606  set dummy $ac_prog; ac_word=$2
  6.2607  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2608  $as_echo_n "checking for $ac_word... " >&6; }
  6.2609 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  6.2610 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  6.2611    $as_echo_n "(cached) " >&6
  6.2612  else
  6.2613    if test -n "$ac_ct_OBJDUMP"; then
  6.2614 @@ -28009,7 +28039,7 @@
  6.2615    IFS=$as_save_IFS
  6.2616    test -z "$as_dir" && as_dir=.
  6.2617      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2618 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2619 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2620      ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
  6.2621      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2622      break 2
  6.2623 @@ -28321,7 +28351,7 @@
  6.2624  set dummy lipo; ac_word=$2
  6.2625  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.2626  $as_echo_n "checking for $ac_word... " >&6; }
  6.2627 -if test "${ac_cv_path_LIPO+set}" = set; then :
  6.2628 +if ${ac_cv_path_LIPO+:} false; then :
  6.2629    $as_echo_n "(cached) " >&6
  6.2630  else
  6.2631    case $LIPO in
  6.2632 @@ -28335,7 +28365,7 @@
  6.2633    IFS=$as_save_IFS
  6.2634    test -z "$as_dir" && as_dir=.
  6.2635      for ac_exec_ext in '' $ac_executable_extensions; do
  6.2636 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2637 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.2638      ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext"
  6.2639      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2640      break 2
  6.2641 @@ -28638,7 +28668,7 @@
  6.2642  
  6.2643  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  6.2644  $as_echo_n "checking for ANSI C header files... " >&6; }
  6.2645 -if test "${ac_cv_header_stdc+set}" = set; then :
  6.2646 +if ${ac_cv_header_stdc+:} false; then :
  6.2647    $as_echo_n "(cached) " >&6
  6.2648  else
  6.2649    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6.2650 @@ -28813,7 +28843,7 @@
  6.2651  for ac_header in stdio.h
  6.2652  do :
  6.2653    ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
  6.2654 -if test "x$ac_cv_header_stdio_h" = x""yes; then :
  6.2655 +if test "x$ac_cv_header_stdio_h" = xyes; then :
  6.2656    cat >>confdefs.h <<_ACEOF
  6.2657  #define HAVE_STDIO_H 1
  6.2658  _ACEOF
  6.2659 @@ -28842,7 +28872,7 @@
  6.2660  # This bug is HP SR number 8606223364.
  6.2661  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
  6.2662  $as_echo_n "checking size of int *... " >&6; }
  6.2663 -if test "${ac_cv_sizeof_int_p+set}" = set; then :
  6.2664 +if ${ac_cv_sizeof_int_p+:} false; then :
  6.2665    $as_echo_n "(cached) " >&6
  6.2666  else
  6.2667    if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
  6.2668 @@ -28852,7 +28882,7 @@
  6.2669       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  6.2670  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.2671  as_fn_error 77 "cannot compute sizeof (int *)
  6.2672 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.2673 +See \`config.log' for more details" "$LINENO" 5; }
  6.2674     else
  6.2675       ac_cv_sizeof_int_p=0
  6.2676     fi
  6.2677 @@ -28899,7 +28929,7 @@
  6.2678  #
  6.2679   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  6.2680  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  6.2681 -if test "${ac_cv_c_bigendian+set}" = set; then :
  6.2682 +if ${ac_cv_c_bigendian+:} false; then :
  6.2683    $as_echo_n "(cached) " >&6
  6.2684  else
  6.2685    ac_cv_c_bigendian=unknown
  6.2686 @@ -30075,8 +30105,8 @@
  6.2687    have_x=disabled
  6.2688  else
  6.2689    case $x_includes,$x_libraries in #(
  6.2690 -    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
  6.2691 -    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  6.2692 +    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
  6.2693 +    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
  6.2694    $as_echo_n "(cached) " >&6
  6.2695  else
  6.2696    # One or both of the vars are not set, and there is no cached value.
  6.2697 @@ -30353,7 +30383,7 @@
  6.2698  else
  6.2699    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  6.2700  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
  6.2701 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
  6.2702 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
  6.2703    $as_echo_n "(cached) " >&6
  6.2704  else
  6.2705    ac_check_lib_save_LIBS=$LIBS
  6.2706 @@ -30387,14 +30417,14 @@
  6.2707  fi
  6.2708  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  6.2709  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
  6.2710 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
  6.2711 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
  6.2712    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  6.2713  fi
  6.2714  
  6.2715      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
  6.2716        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  6.2717  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
  6.2718 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
  6.2719 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
  6.2720    $as_echo_n "(cached) " >&6
  6.2721  else
  6.2722    ac_check_lib_save_LIBS=$LIBS
  6.2723 @@ -30428,7 +30458,7 @@
  6.2724  fi
  6.2725  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  6.2726  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
  6.2727 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
  6.2728 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
  6.2729    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  6.2730  fi
  6.2731  
  6.2732 @@ -30447,14 +30477,14 @@
  6.2733      # The functions gethostbyname, getservbyname, and inet_addr are
  6.2734      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
  6.2735      ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
  6.2736 -if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  6.2737 +if test "x$ac_cv_func_gethostbyname" = xyes; then :
  6.2738  
  6.2739  fi
  6.2740  
  6.2741      if test $ac_cv_func_gethostbyname = no; then
  6.2742        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  6.2743  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
  6.2744 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
  6.2745 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
  6.2746    $as_echo_n "(cached) " >&6
  6.2747  else
  6.2748    ac_check_lib_save_LIBS=$LIBS
  6.2749 @@ -30488,14 +30518,14 @@
  6.2750  fi
  6.2751  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  6.2752  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
  6.2753 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
  6.2754 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
  6.2755    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  6.2756  fi
  6.2757  
  6.2758        if test $ac_cv_lib_nsl_gethostbyname = no; then
  6.2759  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  6.2760  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
  6.2761 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
  6.2762 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
  6.2763    $as_echo_n "(cached) " >&6
  6.2764  else
  6.2765    ac_check_lib_save_LIBS=$LIBS
  6.2766 @@ -30529,7 +30559,7 @@
  6.2767  fi
  6.2768  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  6.2769  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
  6.2770 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
  6.2771 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
  6.2772    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  6.2773  fi
  6.2774  
  6.2775 @@ -30544,14 +30574,14 @@
  6.2776      # must be given before -lnsl if both are needed.  We assume that
  6.2777      # if connect needs -lnsl, so does gethostbyname.
  6.2778      ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
  6.2779 -if test "x$ac_cv_func_connect" = x""yes; then :
  6.2780 +if test "x$ac_cv_func_connect" = xyes; then :
  6.2781  
  6.2782  fi
  6.2783  
  6.2784      if test $ac_cv_func_connect = no; then
  6.2785        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  6.2786  $as_echo_n "checking for connect in -lsocket... " >&6; }
  6.2787 -if test "${ac_cv_lib_socket_connect+set}" = set; then :
  6.2788 +if ${ac_cv_lib_socket_connect+:} false; then :
  6.2789    $as_echo_n "(cached) " >&6
  6.2790  else
  6.2791    ac_check_lib_save_LIBS=$LIBS
  6.2792 @@ -30585,7 +30615,7 @@
  6.2793  fi
  6.2794  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  6.2795  $as_echo "$ac_cv_lib_socket_connect" >&6; }
  6.2796 -if test "x$ac_cv_lib_socket_connect" = x""yes; then :
  6.2797 +if test "x$ac_cv_lib_socket_connect" = xyes; then :
  6.2798    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  6.2799  fi
  6.2800  
  6.2801 @@ -30593,14 +30623,14 @@
  6.2802  
  6.2803      # Guillermo Gomez says -lposix is necessary on A/UX.
  6.2804      ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
  6.2805 -if test "x$ac_cv_func_remove" = x""yes; then :
  6.2806 +if test "x$ac_cv_func_remove" = xyes; then :
  6.2807  
  6.2808  fi
  6.2809  
  6.2810      if test $ac_cv_func_remove = no; then
  6.2811        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  6.2812  $as_echo_n "checking for remove in -lposix... " >&6; }
  6.2813 -if test "${ac_cv_lib_posix_remove+set}" = set; then :
  6.2814 +if ${ac_cv_lib_posix_remove+:} false; then :
  6.2815    $as_echo_n "(cached) " >&6
  6.2816  else
  6.2817    ac_check_lib_save_LIBS=$LIBS
  6.2818 @@ -30634,7 +30664,7 @@
  6.2819  fi
  6.2820  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  6.2821  $as_echo "$ac_cv_lib_posix_remove" >&6; }
  6.2822 -if test "x$ac_cv_lib_posix_remove" = x""yes; then :
  6.2823 +if test "x$ac_cv_lib_posix_remove" = xyes; then :
  6.2824    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  6.2825  fi
  6.2826  
  6.2827 @@ -30642,14 +30672,14 @@
  6.2828  
  6.2829      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
  6.2830      ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
  6.2831 -if test "x$ac_cv_func_shmat" = x""yes; then :
  6.2832 +if test "x$ac_cv_func_shmat" = xyes; then :
  6.2833  
  6.2834  fi
  6.2835  
  6.2836      if test $ac_cv_func_shmat = no; then
  6.2837        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  6.2838  $as_echo_n "checking for shmat in -lipc... " >&6; }
  6.2839 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
  6.2840 +if ${ac_cv_lib_ipc_shmat+:} false; then :
  6.2841    $as_echo_n "(cached) " >&6
  6.2842  else
  6.2843    ac_check_lib_save_LIBS=$LIBS
  6.2844 @@ -30683,7 +30713,7 @@
  6.2845  fi
  6.2846  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  6.2847  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
  6.2848 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
  6.2849 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
  6.2850    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  6.2851  fi
  6.2852  
  6.2853 @@ -30701,7 +30731,7 @@
  6.2854    # John Interrante, Karl Berry
  6.2855    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  6.2856  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
  6.2857 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
  6.2858 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
  6.2859    $as_echo_n "(cached) " >&6
  6.2860  else
  6.2861    ac_check_lib_save_LIBS=$LIBS
  6.2862 @@ -30735,7 +30765,7 @@
  6.2863  fi
  6.2864  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  6.2865  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
  6.2866 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
  6.2867 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
  6.2868    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  6.2869  fi
  6.2870  
  6.2871 @@ -30816,7 +30846,7 @@
  6.2872  CFLAGS="$CFLAGS $X_CFLAGS"
  6.2873  
  6.2874  # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
  6.2875 -for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h
  6.2876 +for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
  6.2877  do :
  6.2878    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  6.2879  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h>
  6.2880 @@ -30869,7 +30899,7 @@
  6.2881          HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
  6.2882      fi
  6.2883  
  6.2884 -    as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG" "$LINENO" 5
  6.2885 +    as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
  6.2886  fi
  6.2887  
  6.2888  
  6.2889 @@ -31753,7 +31783,7 @@
  6.2890              LDFLAGS="$FREETYPE2_LIBS"
  6.2891              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
  6.2892  $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
  6.2893 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
  6.2894 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
  6.2895    $as_echo_n "(cached) " >&6
  6.2896  else
  6.2897    ac_check_lib_save_LIBS=$LIBS
  6.2898 @@ -31787,7 +31817,7 @@
  6.2899  fi
  6.2900  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
  6.2901  $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
  6.2902 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
  6.2903 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
  6.2904    FREETYPE2_FOUND=true
  6.2905  else
  6.2906    as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
  6.2907 @@ -32075,7 +32105,7 @@
  6.2908  	    for ac_header in alsa/asoundlib.h
  6.2909  do :
  6.2910    ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
  6.2911 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
  6.2912 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
  6.2913    cat >>confdefs.h <<_ACEOF
  6.2914  #define HAVE_ALSA_ASOUNDLIB_H 1
  6.2915  _ACEOF
  6.2916 @@ -32134,7 +32164,7 @@
  6.2917  USE_EXTERNAL_LIBJPEG=true
  6.2918  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
  6.2919  $as_echo_n "checking for main in -ljpeg... " >&6; }
  6.2920 -if test "${ac_cv_lib_jpeg_main+set}" = set; then :
  6.2921 +if ${ac_cv_lib_jpeg_main+:} false; then :
  6.2922    $as_echo_n "(cached) " >&6
  6.2923  else
  6.2924    ac_check_lib_save_LIBS=$LIBS
  6.2925 @@ -32162,7 +32192,7 @@
  6.2926  fi
  6.2927  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
  6.2928  $as_echo "$ac_cv_lib_jpeg_main" >&6; }
  6.2929 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
  6.2930 +if test "x$ac_cv_lib_jpeg_main" = xyes; then :
  6.2931    cat >>confdefs.h <<_ACEOF
  6.2932  #define HAVE_LIBJPEG 1
  6.2933  _ACEOF
  6.2934 @@ -32211,7 +32241,7 @@
  6.2935      USE_EXTERNAL_LIBGIF=false
  6.2936  elif test "x${with_giflib}" = "xsystem"; then
  6.2937      ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
  6.2938 -if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
  6.2939 +if test "x$ac_cv_header_gif_lib_h" = xyes; then :
  6.2940  
  6.2941  else
  6.2942     as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
  6.2943 @@ -32220,7 +32250,7 @@
  6.2944  
  6.2945      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
  6.2946  $as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
  6.2947 -if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then :
  6.2948 +if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
  6.2949    $as_echo_n "(cached) " >&6
  6.2950  else
  6.2951    ac_check_lib_save_LIBS=$LIBS
  6.2952 @@ -32254,7 +32284,7 @@
  6.2953  fi
  6.2954  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
  6.2955  $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
  6.2956 -if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then :
  6.2957 +if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
  6.2958    cat >>confdefs.h <<_ACEOF
  6.2959  #define HAVE_LIBGIF 1
  6.2960  _ACEOF
  6.2961 @@ -32286,7 +32316,7 @@
  6.2962  
  6.2963  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
  6.2964  $as_echo_n "checking for compress in -lz... " >&6; }
  6.2965 -if test "${ac_cv_lib_z_compress+set}" = set; then :
  6.2966 +if ${ac_cv_lib_z_compress+:} false; then :
  6.2967    $as_echo_n "(cached) " >&6
  6.2968  else
  6.2969    ac_check_lib_save_LIBS=$LIBS
  6.2970 @@ -32320,7 +32350,7 @@
  6.2971  fi
  6.2972  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
  6.2973  $as_echo "$ac_cv_lib_z_compress" >&6; }
  6.2974 -if test "x$ac_cv_lib_z_compress" = x""yes; then :
  6.2975 +if test "x$ac_cv_lib_z_compress" = xyes; then :
  6.2976     ZLIB_FOUND=yes
  6.2977  else
  6.2978     ZLIB_FOUND=no
  6.2979 @@ -32413,7 +32443,7 @@
  6.2980  
  6.2981  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
  6.2982  $as_echo_n "checking for cos in -lm... " >&6; }
  6.2983 -if test "${ac_cv_lib_m_cos+set}" = set; then :
  6.2984 +if ${ac_cv_lib_m_cos+:} false; then :
  6.2985    $as_echo_n "(cached) " >&6
  6.2986  else
  6.2987    ac_check_lib_save_LIBS=$LIBS
  6.2988 @@ -32447,7 +32477,7 @@
  6.2989  fi
  6.2990  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
  6.2991  $as_echo "$ac_cv_lib_m_cos" >&6; }
  6.2992 -if test "x$ac_cv_lib_m_cos" = x""yes; then :
  6.2993 +if test "x$ac_cv_lib_m_cos" = xyes; then :
  6.2994    cat >>confdefs.h <<_ACEOF
  6.2995  #define HAVE_LIBM 1
  6.2996  _ACEOF
  6.2997 @@ -32471,7 +32501,7 @@
  6.2998  LIBS=""
  6.2999  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  6.3000  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  6.3001 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  6.3002 +if ${ac_cv_lib_dl_dlopen+:} false; then :
  6.3003    $as_echo_n "(cached) " >&6
  6.3004  else
  6.3005    ac_check_lib_save_LIBS=$LIBS
  6.3006 @@ -32505,7 +32535,7 @@
  6.3007  fi
  6.3008  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  6.3009  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  6.3010 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  6.3011 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  6.3012    cat >>confdefs.h <<_ACEOF
  6.3013  #define HAVE_LIBDL 1
  6.3014  _ACEOF
  6.3015 @@ -32735,7 +32765,7 @@
  6.3016  See the pkg-config man page for more details.
  6.3017  
  6.3018  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  6.3019 -See \`config.log' for more details" "$LINENO" 5 ; }
  6.3020 +See \`config.log' for more details" "$LINENO" 5; }
  6.3021  else
  6.3022  	LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
  6.3023  	LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
  6.3024 @@ -32751,7 +32781,7 @@
  6.3025  set dummy llvm-config; ac_word=$2
  6.3026  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.3027  $as_echo_n "checking for $ac_word... " >&6; }
  6.3028 -if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then :
  6.3029 +if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
  6.3030    $as_echo_n "(cached) " >&6
  6.3031  else
  6.3032    if test -n "$LLVM_CONFIG"; then
  6.3033 @@ -32763,7 +32793,7 @@
  6.3034    IFS=$as_save_IFS
  6.3035    test -z "$as_dir" && as_dir=.
  6.3036      for ac_exec_ext in '' $ac_executable_extensions; do
  6.3037 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3038 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.3039      ac_cv_prog_LLVM_CONFIG="llvm-config"
  6.3040      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3041      break 2
  6.3042 @@ -33367,7 +33397,7 @@
  6.3043  set dummy ccache; ac_word=$2
  6.3044  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6.3045  $as_echo_n "checking for $ac_word... " >&6; }
  6.3046 -if test "${ac_cv_path_CCACHE+set}" = set; then :
  6.3047 +if ${ac_cv_path_CCACHE+:} false; then :
  6.3048    $as_echo_n "(cached) " >&6
  6.3049  else
  6.3050    case $CCACHE in
  6.3051 @@ -33381,7 +33411,7 @@
  6.3052    IFS=$as_save_IFS
  6.3053    test -z "$as_dir" && as_dir=.
  6.3054      for ac_exec_ext in '' $ac_executable_extensions; do
  6.3055 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3056 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6.3057      ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
  6.3058      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3059      break 2
  6.3060 @@ -33629,10 +33659,21 @@
  6.3061       :end' >>confcache
  6.3062  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  6.3063    if test -w "$cache_file"; then
  6.3064 -    test "x$cache_file" != "x/dev/null" &&
  6.3065 +    if test "x$cache_file" != "x/dev/null"; then
  6.3066        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  6.3067  $as_echo "$as_me: updating cache $cache_file" >&6;}
  6.3068 -    cat confcache >$cache_file
  6.3069 +      if test ! -f "$cache_file" || test -h "$cache_file"; then
  6.3070 +	cat confcache >"$cache_file"
  6.3071 +      else
  6.3072 +        case $cache_file in #(
  6.3073 +        */* | ?:*)
  6.3074 +	  mv -f confcache "$cache_file"$$ &&
  6.3075 +	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  6.3076 +        *)
  6.3077 +	  mv -f confcache "$cache_file" ;;
  6.3078 +	esac
  6.3079 +      fi
  6.3080 +    fi
  6.3081    else
  6.3082      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  6.3083  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  6.3084 @@ -33664,7 +33705,7 @@
  6.3085  
  6.3086  
  6.3087  
  6.3088 -: ${CONFIG_STATUS=./config.status}
  6.3089 +: "${CONFIG_STATUS=./config.status}"
  6.3090  ac_write_fail=0
  6.3091  ac_clean_files_save=$ac_clean_files
  6.3092  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  6.3093 @@ -33765,6 +33806,7 @@
  6.3094  IFS=" ""	$as_nl"
  6.3095  
  6.3096  # Find who we are.  Look in the path if we contain no directory separator.
  6.3097 +as_myself=
  6.3098  case $0 in #((
  6.3099    *[\\/]* ) as_myself=$0 ;;
  6.3100    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.3101 @@ -33960,16 +34002,16 @@
  6.3102      # ... but there are two gotchas:
  6.3103      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
  6.3104      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
  6.3105 -    # In both cases, we have to default to `cp -p'.
  6.3106 +    # In both cases, we have to default to `cp -pR'.
  6.3107      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
  6.3108 -      as_ln_s='cp -p'
  6.3109 +      as_ln_s='cp -pR'
  6.3110    elif ln conf$$.file conf$$ 2>/dev/null; then
  6.3111      as_ln_s=ln
  6.3112    else
  6.3113 -    as_ln_s='cp -p'
  6.3114 -  fi
  6.3115 -else
  6.3116 -  as_ln_s='cp -p'
  6.3117 +    as_ln_s='cp -pR'
  6.3118 +  fi
  6.3119 +else
  6.3120 +  as_ln_s='cp -pR'
  6.3121  fi
  6.3122  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  6.3123  rmdir conf$$.dir 2>/dev/null
  6.3124 @@ -34029,28 +34071,16 @@
  6.3125    as_mkdir_p=false
  6.3126  fi
  6.3127  
  6.3128 -if test -x / >/dev/null 2>&1; then
  6.3129 -  as_test_x='test -x'
  6.3130 -else
  6.3131 -  if ls -dL / >/dev/null 2>&1; then
  6.3132 -    as_ls_L_option=L
  6.3133 -  else
  6.3134 -    as_ls_L_option=
  6.3135 -  fi
  6.3136 -  as_test_x='
  6.3137 -    eval sh -c '\''
  6.3138 -      if test -d "$1"; then
  6.3139 -	test -d "$1/.";
  6.3140 -      else
  6.3141 -	case $1 in #(
  6.3142 -	-*)set "./$1";;
  6.3143 -	esac;
  6.3144 -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  6.3145 -	???[sx]*):;;*)false;;esac;fi
  6.3146 -    '\'' sh
  6.3147 -  '
  6.3148 -fi
  6.3149 -as_executable_p=$as_test_x
  6.3150 +
  6.3151 +# as_fn_executable_p FILE
  6.3152 +# -----------------------
  6.3153 +# Test if FILE is an executable regular file.
  6.3154 +as_fn_executable_p ()
  6.3155 +{
  6.3156 +  test -f "$1" && test -x "$1"
  6.3157 +} # as_fn_executable_p
  6.3158 +as_test_x='test -x'
  6.3159 +as_executable_p=as_fn_executable_p
  6.3160  
  6.3161  # Sed expression to map a string onto a valid CPP name.
  6.3162  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  6.3163 @@ -34072,7 +34102,7 @@
  6.3164  # values after options handling.
  6.3165  ac_log="
  6.3166  This file was extended by OpenJDK $as_me jdk8, which was
  6.3167 -generated by GNU Autoconf 2.67.  Invocation command line was
  6.3168 +generated by GNU Autoconf 2.69.  Invocation command line was
  6.3169  
  6.3170    CONFIG_FILES    = $CONFIG_FILES
  6.3171    CONFIG_HEADERS  = $CONFIG_HEADERS
  6.3172 @@ -34135,10 +34165,10 @@
  6.3173  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  6.3174  ac_cs_version="\\
  6.3175  OpenJDK config.status jdk8
  6.3176 -configured by $0, generated by GNU Autoconf 2.67,
  6.3177 +configured by $0, generated by GNU Autoconf 2.69,
  6.3178    with options \\"\$ac_cs_config\\"
  6.3179  
  6.3180 -Copyright (C) 2010 Free Software Foundation, Inc.
  6.3181 +Copyright (C) 2012 Free Software Foundation, Inc.
  6.3182  This config.status script is free software; the Free Software Foundation
  6.3183  gives unlimited permission to copy, distribute and modify it."
  6.3184  
  6.3185 @@ -34227,7 +34257,7 @@
  6.3186  _ACEOF
  6.3187  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  6.3188  if \$ac_cs_recheck; then
  6.3189 -  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  6.3190 +  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  6.3191    shift
  6.3192    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
  6.3193    CONFIG_SHELL='$SHELL'
  6.3194 @@ -34264,7 +34294,7 @@
  6.3195      "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
  6.3196      "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
  6.3197  
  6.3198 -  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  6.3199 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  6.3200    esac
  6.3201  done
  6.3202  
  6.3203 @@ -34286,9 +34316,10 @@
  6.3204  # after its creation but before its name has been assigned to `$tmp'.
  6.3205  $debug ||
  6.3206  {
  6.3207 -  tmp=
  6.3208 +  tmp= ac_tmp=
  6.3209    trap 'exit_status=$?
  6.3210 -  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  6.3211 +  : "${ac_tmp:=$tmp}"
  6.3212 +  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  6.3213  ' 0
  6.3214    trap 'as_fn_exit 1' 1 2 13 15
  6.3215  }
  6.3216 @@ -34296,12 +34327,13 @@
  6.3217  
  6.3218  {
  6.3219    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  6.3220 -  test -n "$tmp" && test -d "$tmp"
  6.3221 +  test -d "$tmp"
  6.3222  }  ||
  6.3223  {
  6.3224    tmp=./conf$$-$RANDOM
  6.3225    (umask 077 && mkdir "$tmp")
  6.3226  } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  6.3227 +ac_tmp=$tmp
  6.3228  
  6.3229  # Set up the scripts for CONFIG_FILES section.
  6.3230  # No need to generate them if there are no CONFIG_FILES.
  6.3231 @@ -34323,7 +34355,7 @@
  6.3232    ac_cs_awk_cr=$ac_cr
  6.3233  fi
  6.3234  
  6.3235 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
  6.3236 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  6.3237  _ACEOF
  6.3238  
  6.3239  
  6.3240 @@ -34351,7 +34383,7 @@
  6.3241  rm -f conf$$subs.sh
  6.3242  
  6.3243  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  6.3244 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  6.3245 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  6.3246  _ACEOF
  6.3247  sed -n '
  6.3248  h
  6.3249 @@ -34399,7 +34431,7 @@
  6.3250  rm -f conf$$subs.awk
  6.3251  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  6.3252  _ACAWK
  6.3253 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  6.3254 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  6.3255    for (key in S) S_is_set[key] = 1
  6.3256    FS = ""
  6.3257  
  6.3258 @@ -34431,7 +34463,7 @@
  6.3259    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  6.3260  else
  6.3261    cat
  6.3262 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  6.3263 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  6.3264    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  6.3265  _ACEOF
  6.3266  
  6.3267 @@ -34465,7 +34497,7 @@
  6.3268  # No need to generate them if there are no CONFIG_HEADERS.
  6.3269  # This happens for instance with `./config.status Makefile'.
  6.3270  if test -n "$CONFIG_HEADERS"; then
  6.3271 -cat >"$tmp/defines.awk" <<\_ACAWK ||
  6.3272 +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  6.3273  BEGIN {
  6.3274  _ACEOF
  6.3275  
  6.3276 @@ -34477,8 +34509,8 @@
  6.3277  # handling of long lines.
  6.3278  ac_delim='%!_!# '
  6.3279  for ac_last_try in false false :; do
  6.3280 -  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  6.3281 -  if test -z "$ac_t"; then
  6.3282 +  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  6.3283 +  if test -z "$ac_tt"; then
  6.3284      break
  6.3285    elif $ac_last_try; then
  6.3286      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  6.3287 @@ -34579,7 +34611,7 @@
  6.3288    esac
  6.3289    case $ac_mode$ac_tag in
  6.3290    :[FHL]*:*);;
  6.3291 -  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
  6.3292 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  6.3293    :[FH]-) ac_tag=-:-;;
  6.3294    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  6.3295    esac
  6.3296 @@ -34598,7 +34630,7 @@
  6.3297      for ac_f
  6.3298      do
  6.3299        case $ac_f in
  6.3300 -      -) ac_f="$tmp/stdin";;
  6.3301 +      -) ac_f="$ac_tmp/stdin";;
  6.3302        *) # Look for the file first in the build tree, then in the source tree
  6.3303  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  6.3304  	 # because $ac_f cannot contain `:'.
  6.3305 @@ -34607,7 +34639,7 @@
  6.3306  	   [\\/$]*) false;;
  6.3307  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  6.3308  	   esac ||
  6.3309 -	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
  6.3310 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  6.3311        esac
  6.3312        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  6.3313        as_fn_append ac_file_inputs " '$ac_f'"
  6.3314 @@ -34633,8 +34665,8 @@
  6.3315      esac
  6.3316  
  6.3317      case $ac_tag in
  6.3318 -    *:-:* | *:-) cat >"$tmp/stdin" \
  6.3319 -      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
  6.3320 +    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  6.3321 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  6.3322      esac
  6.3323      ;;
  6.3324    esac
  6.3325 @@ -34759,21 +34791,22 @@
  6.3326  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  6.3327  $ac_datarootdir_hack
  6.3328  "
  6.3329 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  6.3330 -  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  6.3331 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  6.3332 +  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  6.3333  
  6.3334  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  6.3335 -  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  6.3336 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  6.3337 +  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  6.3338 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  6.3339 +      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  6.3340    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  6.3341  which seems to be undefined.  Please make sure it is defined" >&5
  6.3342  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  6.3343  which seems to be undefined.  Please make sure it is defined" >&2;}
  6.3344  
  6.3345 -  rm -f "$tmp/stdin"
  6.3346 +  rm -f "$ac_tmp/stdin"
  6.3347    case $ac_file in
  6.3348 -  -) cat "$tmp/out" && rm -f "$tmp/out";;
  6.3349 -  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  6.3350 +  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  6.3351 +  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  6.3352    esac \
  6.3353    || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  6.3354   ;;
  6.3355 @@ -34784,20 +34817,20 @@
  6.3356    if test x"$ac_file" != x-; then
  6.3357      {
  6.3358        $as_echo "/* $configure_input  */" \
  6.3359 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  6.3360 -    } >"$tmp/config.h" \
  6.3361 +      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  6.3362 +    } >"$ac_tmp/config.h" \
  6.3363        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  6.3364 -    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  6.3365 +    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  6.3366        { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  6.3367  $as_echo "$as_me: $ac_file is unchanged" >&6;}
  6.3368      else
  6.3369        rm -f "$ac_file"
  6.3370 -      mv "$tmp/config.h" "$ac_file" \
  6.3371 +      mv "$ac_tmp/config.h" "$ac_file" \
  6.3372  	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  6.3373      fi
  6.3374    else
  6.3375      $as_echo "/* $configure_input  */" \
  6.3376 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  6.3377 +      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  6.3378        || as_fn_error $? "could not create -" "$LINENO" 5
  6.3379    fi
  6.3380   ;;
     7.1 --- a/common/autoconf/help.m4	Tue Aug 27 16:05:30 2013 -0300
     7.2 +++ b/common/autoconf/help.m4	Fri Sep 13 10:14:55 2013 -0300
     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	Tue Aug 27 16:05:30 2013 -0300
     8.2 +++ b/common/autoconf/libraries.m4	Fri Sep 13 10:14:55 2013 -0300
     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/bin/hgforest.sh	Tue Aug 27 16:05:30 2013 -0300
     9.2 +++ b/common/bin/hgforest.sh	Fri Sep 13 10:14:55 2013 -0300
     9.3 @@ -47,7 +47,7 @@
     9.4  bpython=""
     9.5  
     9.6  if [ "#!" = "$has_hash_bang" ] ; then
     9.7 -   python="`head -n 1 ${whichhg} | cut -b 3-`"
     9.8 +   python="`head -n 1 ${whichhg} | cut -b 3- | sed -e 's/^[ \t]*//;s/[ \t]*$//'`"
     9.9     bpython="`basename "$python"`"
    9.10  fi
    9.11  
    10.1 --- a/common/makefiles/Main.gmk	Tue Aug 27 16:05:30 2013 -0300
    10.2 +++ b/common/makefiles/Main.gmk	Fri Sep 13 10:14:55 2013 -0300
    10.3 @@ -242,7 +242,7 @@
    10.4  
    10.5  .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
    10.6  .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
    10.7 -.PHONY: all clean dist-clean bootcycle-images start-make
    10.8 +.PHONY: default all clean dist-clean bootcycle-images start-make
    10.9  .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
   10.10  .PHONY: profiles profiles-only profiles-oscheck
   10.11  
    11.1 --- a/test/Makefile	Tue Aug 27 16:05:30 2013 -0300
    11.2 +++ b/test/Makefile	Fri Sep 13 10:14:55 2013 -0300
    11.3 @@ -57,7 +57,7 @@
    11.4  
    11.5  # Test targets
    11.6  langtools_% :
    11.7 -	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_OUTPUT_DIR=$(ALT_OUTPUTDIR)/testoutput/langtools/jtreg JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
    11.8 +	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
    11.9  
   11.10  jdk_% :
   11.11  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)

mercurial