[llvm-commits] [llvm] r62751 - in /llvm/trunk: autoconf/configure.ac configure include/llvm/Config/config.h.in

Bill Wendling isanbard at gmail.com
Thu Jan 22 11:35:44 PST 2009


Tanya,

I think that this is causing a build failure on Darwin:

g++ -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/obj-llvm/include
-I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/obj-llvm/lib/ExecutionEngine/Interpreter
-I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/include
-I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/ExecutionEngine/Interpreter
 -D_DEBUG  -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS -O3  -fno-exceptions -DLLVM_VERSION_INFO='"
Apple Build #9999-01"' -Woverloaded-virtual -pedantic -Wall -W
-Wwrite-strings -Wno-long-long -Wunused -Wno-unused-parameter
-fstrict-aliasing -Wstrict-aliasing -arch i386 -c
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
-o /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/obj-llvm/lib/ExecutionEngine/Interpreter/Release/ExternalFunctions.o
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:37:10:
error: #include expects "FILENAME" or <FILENAME>

The problem seems to be here.

ExternalFunctions.cpp:

#ifdef HAVE_LIBFFI
#include FFI_HEADER
#endif

In the builds, the generated config.h file has this:

include/llvm/Config/config.h:/* #undef FFI_HEADER */

while HAVE_LIBFFI is defined as this:

include/llvm/Config/config.h:#define HAVE_LIBFFI 1

Could you check on this? It might have been an autoconf versioning thing.

-bw

On Wed, Jan 21, 2009 at 9:17 PM, Tanya Lattner <tonic at nondot.org> wrote:
> Author: tbrethou
> Date: Wed Jan 21 23:17:59 2009
> New Revision: 62751
>
> URL: http://llvm.org/viewvc/llvm-project?rev=62751&view=rev
> Log:
> Bump to 2.6svn.
> Regenerate configure (last regen was with the wrong version).
>
> Modified:
>    llvm/trunk/autoconf/configure.ac
>    llvm/trunk/configure
>    llvm/trunk/include/llvm/Config/config.h.in
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=62751&r1=62750&r2=62751&view=diff
>
> ==============================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Wed Jan 21 23:17:59 2009
> @@ -31,7 +31,7 @@
>  dnl===-----------------------------------------------------------------------===
>  dnl Initialize autoconf and define the package name, version number and
>  dnl email address for reporting bugs.
> -AC_INIT([[llvm]],[[2.5svn]],[llvmbugs at cs.uiuc.edu])
> +AC_INIT([[llvm]],[[2.6svn]],[llvmbugs at cs.uiuc.edu])
>
>  dnl Provide a copyright substitution and ensure the copyright notice is included
>  dnl in the output of --version option of the generated configure script.
>
> Modified: llvm/trunk/configure
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=62751&r1=62750&r2=62751&view=diff
>
> ==============================================================================
> --- llvm/trunk/configure (original)
> +++ llvm/trunk/configure Wed Jan 21 23:17:59 2009
> @@ -1,6 +1,6 @@
>  #! /bin/sh
>  # Guess values for system-dependent variables and create Makefiles.
> -# Generated by GNU Autoconf 2.61 for llvm 2.5svn.
> +# Generated by GNU Autoconf 2.60 for llvm 2.6svn.
>  #
>  # Report bugs to <llvmbugs at cs.uiuc.edu>.
>  #
> @@ -14,8 +14,7 @@
>  ## M4sh Initialization.  ##
>  ## --------------------- ##
>
> -# Be more Bourne compatible
> -DUALCASE=1; export DUALCASE # for MKS sh
> +# Be Bourne compatible
>  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>   emulate sh
>   NULLCMD=:
> @@ -24,13 +23,10 @@
>   alias -g '${1+"$@"}'='"$@"'
>   setopt NO_GLOB_SUBST
>  else
> -  case `(set -o) 2>/dev/null` in
> -  *posix*) set -o posix ;;
> -esac
> -
> +  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
>  fi
> -
> -
> +BIN_SH=xpg4; export BIN_SH # for Tru64
> +DUALCASE=1; export DUALCASE # for MKS sh
>
>
>  # PATH needs CR
> @@ -223,7 +219,7 @@
>  else
>   as_candidate_shells=
>     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
> +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
>  do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
> @@ -241,6 +237,7 @@
>         # Try only shells that exist, to save several forks.
>         if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
>                { ("$as_shell") 2> /dev/null <<\_ASEOF
> +# Be Bourne compatible
>  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>   emulate sh
>   NULLCMD=:
> @@ -249,12 +246,10 @@
>   alias -g '${1+"$@"}'='"$@"'
>   setopt NO_GLOB_SUBST
>  else
> -  case `(set -o) 2>/dev/null` in
> -  *posix*) set -o posix ;;
> -esac
> -
> +  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
>  fi
> -
> +BIN_SH=xpg4; export BIN_SH # for Tru64
> +DUALCASE=1; export DUALCASE # for MKS sh
>
>  :
>  _ASEOF
> @@ -262,6 +257,7 @@
>   CONFIG_SHELL=$as_shell
>               as_have_required=yes
>               if { "$as_shell" 2> /dev/null <<\_ASEOF
> +# Be Bourne compatible
>  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>   emulate sh
>   NULLCMD=:
> @@ -270,12 +266,10 @@
>   alias -g '${1+"$@"}'='"$@"'
>   setopt NO_GLOB_SUBST
>  else
> -  case `(set -o) 2>/dev/null` in
> -  *posix*) set -o posix ;;
> -esac
> -
> +  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
>  fi
> -
> +BIN_SH=xpg4; export BIN_SH # for Tru64
> +DUALCASE=1; export DUALCASE # for MKS sh
>
>  :
>  (as_func_return () {
> @@ -522,28 +516,19 @@
>   as_mkdir_p=false
>  fi
>
> -if test -x / >/dev/null 2>&1; then
> -  as_test_x='test -x'
> +# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
> +# systems may use methods other than mode bits to determine executability.
> +cat >conf$$.file <<_ASEOF
> +#! /bin/sh
> +exit 0
> +_ASEOF
> +chmod +x conf$$.file
> +if test -x conf$$.file >/dev/null 2>&1; then
> +  as_executable_p="test -x"
>  else
> -  if ls -dL / >/dev/null 2>&1; then
> -    as_ls_L_option=L
> -  else
> -    as_ls_L_option=
> -  fi
> -  as_test_x='
> -    eval sh -c '\''
> -      if test -d "$1"; then
> -        test -d "$1/.";
> -      else
> -       case $1 in
> -        -*)set "./$1";;
> -       esac;
> -       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
> -       ???[sx]*):;;*)false;;esac;fi
> -    '\'' sh
> -  '
> +  as_executable_p=:
>  fi
> -as_executable_p=$as_test_x
> +rm -f conf$$.file
>
>  # Sed expression to map a string onto a valid CPP name.
>  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
> @@ -730,44 +715,44 @@
>  # Identity of this package.
>  PACKAGE_NAME='llvm'
>  PACKAGE_TARNAME='-llvm-'
> -PACKAGE_VERSION='2.5svn'
> -PACKAGE_STRING='llvm 2.5svn'
> +PACKAGE_VERSION='2.6svn'
> +PACKAGE_STRING='llvm 2.6svn'
>  PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu'
>
>  ac_unique_file="lib/VMCore/Module.cpp"
>  # Factoring default headers for most tests.
>  ac_includes_default="\
>  #include <stdio.h>
> -#ifdef HAVE_SYS_TYPES_H
> +#if HAVE_SYS_TYPES_H
>  # include <sys/types.h>
>  #endif
> -#ifdef HAVE_SYS_STAT_H
> +#if HAVE_SYS_STAT_H
>  # include <sys/stat.h>
>  #endif
> -#ifdef STDC_HEADERS
> +#if STDC_HEADERS
>  # include <stdlib.h>
>  # include <stddef.h>
>  #else
> -# ifdef HAVE_STDLIB_H
> +# if HAVE_STDLIB_H
>  #  include <stdlib.h>
>  # endif
>  #endif
> -#ifdef HAVE_STRING_H
> -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
> +#if HAVE_STRING_H
> +# if !STDC_HEADERS && HAVE_MEMORY_H
>  #  include <memory.h>
>  # endif
>  # include <string.h>
>  #endif
> -#ifdef HAVE_STRINGS_H
> +#if HAVE_STRINGS_H
>  # include <strings.h>
>  #endif
> -#ifdef HAVE_INTTYPES_H
> +#if HAVE_INTTYPES_H
>  # include <inttypes.h>
>  #endif
> -#ifdef HAVE_STDINT_H
> +#if HAVE_STDINT_H
>  # include <stdint.h>
>  #endif
> -#ifdef HAVE_UNISTD_H
> +#if HAVE_UNISTD_H
>  # include <unistd.h>
>  #endif"
>
> @@ -861,8 +846,8 @@
>  CXXFLAGS
>  ac_ct_CXX
>  LEX
> -LEX_OUTPUT_ROOT
>  LEXLIB
> +LEX_OUTPUT_ROOT
>  FLEX
>  YACC
>  YFLAGS
> @@ -955,7 +940,6 @@
>  CC
>  CFLAGS
>  LDFLAGS
> -LIBS
>  CPPFLAGS
>  CPP
>  CXX
> @@ -1082,10 +1066,10 @@
>   -disable-* | --disable-*)
>     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
>     # Reject names that are not valid shell variable names.
> -    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
> +    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
>    { (exit 1); exit 1; }; }
> -    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
> +    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
>     eval enable_$ac_feature=no ;;
>
>   -docdir | --docdir | --docdi | --doc | --do)
> @@ -1101,10 +1085,10 @@
>   -enable-* | --enable-*)
>     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
>     # Reject names that are not valid shell variable names.
> -    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
> +    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
>    { (exit 1); exit 1; }; }
> -    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
> +    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
>     eval enable_$ac_feature=\$ac_optarg ;;
>
>   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
> @@ -1298,19 +1282,19 @@
>   -with-* | --with-*)
>     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
>     # Reject names that are not valid shell variable names.
> -    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
> +    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid package name: $ac_package" >&2
>    { (exit 1); exit 1; }; }
> -    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
> +    ac_package=`echo $ac_package| sed 's/-/_/g'`
>     eval with_$ac_package=\$ac_optarg ;;
>
>   -without-* | --without-*)
>     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
>     # Reject names that are not valid shell variable names.
> -    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
> +    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
>       { echo "$as_me: error: invalid package name: $ac_package" >&2
>    { (exit 1); exit 1; }; }
> -    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
> +    ac_package=`echo $ac_package | sed 's/-/_/g'`
>     eval with_$ac_package=no ;;
>
>   --x)
> @@ -1479,7 +1463,7 @@
>   # Omit some internal or obsolete options to make the list less imposing.
>   # This message is too long to be a string in the A/UX 3.1 sh.
>   cat <<_ACEOF
> -\`configure' configures llvm 2.5svn to adapt to many kinds of systems.
> +\`configure' configures llvm 2.6svn to adapt to many kinds of systems.
>
>  Usage: $0 [OPTION]... [VAR=VALUE]...
>
> @@ -1545,7 +1529,7 @@
>
>  if test -n "$ac_init_help"; then
>   case $ac_init_help in
> -     short | recursive ) echo "Configuration of llvm 2.5svn:";;
> +     short | recursive ) echo "Configuration of llvm 2.6svn:";;
>    esac
>   cat <<\_ACEOF
>
> @@ -1602,7 +1586,6 @@
>   CFLAGS      C compiler flags
>   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
>               nonstandard directory <lib dir>
> -  LIBS        libraries to pass to the linker, e.g. -l<library>
>   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
>               you have headers in a nonstandard directory <include dir>
>   CPP         C preprocessor
> @@ -1681,8 +1664,8 @@
>  test -n "$ac_init_help" && exit $ac_status
>  if $ac_init_version; then
>   cat <<\_ACEOF
> -llvm configure 2.5svn
> -generated by GNU Autoconf 2.61
> +llvm configure 2.6svn
> +generated by GNU Autoconf 2.60
>
>  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
>  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
> @@ -1697,8 +1680,8 @@
>  This file contains any messages produced by compilers while
>  running configure, to aid debugging if configure makes a mistake.
>
> -It was created by llvm $as_me 2.5svn, which was
> -generated by GNU Autoconf 2.61.  Invocation command line was
> +It was created by llvm $as_me 2.6svn, which was
> +generated by GNU Autoconf 2.60.  Invocation command line was
>
>   $ $0 $@
>
> @@ -2443,7 +2426,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="${ac_tool_prefix}gcc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -2483,7 +2466,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CC="gcc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -2540,7 +2523,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="${ac_tool_prefix}cc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -2581,7 +2564,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
>        ac_prog_rejected=yes
>        continue
> @@ -2639,7 +2622,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -2683,7 +2666,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CC="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -2824,7 +2807,7 @@
>  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
>  # so that the user can short-circuit this test for compilers unknown to
>  # Autoconf.
> -for ac_file in $ac_files ''
> +for ac_file in $ac_files
>  do
>   test -f "$ac_file" || continue
>   case $ac_file in
> @@ -2852,12 +2835,6 @@
>  test "$ac_cv_exeext" = no && ac_cv_exeext=
>
>  else
> -  ac_file=''
> -fi
> -
> -{ echo "$as_me:$LINENO: result: $ac_file" >&5
> -echo "${ECHO_T}$ac_file" >&6; }
> -if test -z "$ac_file"; then
>   echo "$as_me: failed program was:" >&5
>  sed 's/^/| /' conftest.$ac_ext >&5
>
> @@ -2869,6 +2846,8 @@
>  fi
>
>  ac_exeext=$ac_cv_exeext
> +{ echo "$as_me:$LINENO: result: $ac_file" >&5
> +echo "${ECHO_T}$ac_file" >&6; }
>
>  # Check that the compiler produces executables we can run.  If not, either
>  # the compiler is broken, or we cross compile.
> @@ -3046,10 +3025,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_compiler_gnu=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3104,10 +3100,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cc_g=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3142,10 +3155,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3181,10 +3211,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cc_g=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3300,10 +3347,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cc_c89=$ac_arg
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3393,10 +3457,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3430,10 +3501,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   # Broken: success on invalid input.
>  continue
>  else
> @@ -3498,10 +3576,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3535,10 +3620,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   # Broken: success on invalid input.
>  continue
>  else
> @@ -3593,7 +3685,7 @@
>   for ac_prog in grep ggrep; do
>   for ac_exec_ext in '' $ac_executable_extensions; do
>     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
> -    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
> +    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
>     # Check for GNU ac_path_GREP and select it if it is found.
>   # Check for GNU $ac_path_GREP
>  case `"$ac_path_GREP" --version 2>&1` in
> @@ -3675,7 +3767,7 @@
>   for ac_prog in egrep; do
>   for ac_exec_ext in '' $ac_executable_extensions; do
>     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
> -    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
> +    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
>     # Check for GNU ac_path_EGREP and select it if it is found.
>   # Check for GNU $ac_path_EGREP
>  case `"$ac_path_EGREP" --version 2>&1` in
> @@ -3771,10 +3863,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_header_stdc=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3950,10 +4059,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_Header=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -3995,8 +4121,7 @@
>  int
>  main ()
>  {
> -#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
> -       && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
> +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
>  bogus endian macros
>  #endif
>
> @@ -4017,10 +4142,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   # It does; now see whether it defined to BIG_ENDIAN or not.
>  cat >conftest.$ac_ext <<_ACEOF
>  /* confdefs.h.  */
> @@ -4055,10 +4197,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_c_bigendian=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -4109,10 +4268,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
>   ac_cv_c_bigendian=yes
>  fi
> @@ -4242,7 +4418,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_BUILD_CC="${ac_build_prefix}gcc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -4280,7 +4456,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_BUILD_CC="gcc"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -4319,7 +4495,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
>        ac_prog_rejected=yes
>        continue
> @@ -4409,7 +4585,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_BUILD_CXX="${ac_build_prefix}g++"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -4447,7 +4623,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_BUILD_CXX="g++"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -4486,7 +4662,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/c++"; then
>        ac_prog_rejected=yes
>        continue
> @@ -4939,10 +5115,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -4976,10 +5159,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   # Broken: success on invalid input.
>  continue
>  else
> @@ -5044,10 +5234,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5081,10 +5278,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   # Broken: success on invalid input.
>  continue
>  else
> @@ -5141,7 +5345,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -5185,7 +5389,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CC="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -5303,10 +5507,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_compiler_gnu=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5361,10 +5582,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cc_g=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5399,10 +5637,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5438,10 +5693,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cc_g=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5557,10 +5829,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cc_c89=$ac_arg
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5625,7 +5914,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -5669,7 +5958,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_CXX="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -5782,10 +6071,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_cxx_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_compiler_gnu=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5840,10 +6146,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_cxx_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cxx_g=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5878,10 +6201,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_cxx_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   :
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5917,10 +6257,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_cxx_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_prog_cxx_g=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -5984,7 +6341,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_LEX="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6009,70 +6366,37 @@
>  done
>  test -n "$LEX" || LEX=":"
>
> -if test "x$LEX" != "x:"; then
> -  cat >conftest.l <<_ACEOF
> -%%
> -a { ECHO; }
> -b { REJECT; }
> -c { yymore (); }
> -d { yyless (1); }
> -e { yyless (input () != 0); }
> -f { unput (yytext[0]); }
> -. { BEGIN INITIAL; }
> -%%
> -#ifdef YYTEXT_POINTER
> -extern char *yytext;
> +if test -z "$LEXLIB"
> +then
> +  { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
> +echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
> +if test "${ac_cv_lib_fl_yywrap+set}" = set; then
> +  echo $ECHO_N "(cached) $ECHO_C" >&6
> +else
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lfl  $LIBS"
> +cat >conftest.$ac_ext <<_ACEOF
> +/* confdefs.h.  */
> +_ACEOF
> +cat confdefs.h >>conftest.$ac_ext
> +cat >>conftest.$ac_ext <<_ACEOF
> +/* end confdefs.h.  */
> +
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
>  #endif
> +char yywrap ();
>  int
> -main (void)
> +main ()
>  {
> -  return ! yylex () + ! yywrap ();
> +return yywrap ();
> +  ;
> +  return 0;
>  }
>  _ACEOF
> -{ (ac_try="$LEX conftest.l"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> -  (eval "$LEX conftest.l") 2>&5
> -  ac_status=$?
> -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); }
> -{ echo "$as_me:$LINENO: checking lex output file root" >&5
> -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
> -if test "${ac_cv_prog_lex_root+set}" = set; then
> -  echo $ECHO_N "(cached) $ECHO_C" >&6
> -else
> -
> -if test -f lex.yy.c; then
> -  ac_cv_prog_lex_root=lex.yy
> -elif test -f lexyy.c; then
> -  ac_cv_prog_lex_root=lexyy
> -else
> -  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
> -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
> -   { (exit 1); exit 1; }; }
> -fi
> -fi
> -{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
> -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
> -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
> -
> -if test -z "${LEXLIB+set}"; then
> -  { echo "$as_me:$LINENO: checking lex library" >&5
> -echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
> -if test "${ac_cv_lib_lex+set}" = set; then
> -  echo $ECHO_N "(cached) $ECHO_C" >&6
> -else
> -
> -    ac_save_LIBS=$LIBS
> -    ac_cv_lib_lex='none needed'
> -    for ac_lib in '' -lfl -ll; do
> -      LIBS="$ac_lib $ac_save_LIBS"
> -      cat >conftest.$ac_ext <<_ACEOF
> -`cat $LEX_OUTPUT_ROOT.c`
> -_ACEOF
>  rm -f conftest.$ac_objext conftest$ac_exeext
>  if { (ac_try="$ac_link"
>  case "(($ac_try" in
> @@ -6086,46 +6410,72 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> -  ac_cv_lib_lex=$ac_lib
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
> +  ac_cv_lib_fl_yywrap=yes
>  else
>   echo "$as_me: failed program was:" >&5
>  sed 's/^/| /' conftest.$ac_ext >&5
>
> -
> +       ac_cv_lib_fl_yywrap=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
> -      test "$ac_cv_lib_lex" != 'none needed' && break
> -    done
> -    LIBS=$ac_save_LIBS
> -
> -fi
> -{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
> -echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
> -  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
> +LIBS=$ac_check_lib_save_LIBS
>  fi
> -
> -
> -{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
> -echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
> -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
> +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
> +echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
> +if test $ac_cv_lib_fl_yywrap = yes; then
> +  LEXLIB="-lfl"
> +else
> +  { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
> +echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
> +if test "${ac_cv_lib_l_yywrap+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>  else
> -  # POSIX says lex can declare yytext either as a pointer or an array; the
> -# default is implementation-dependent.  Figure out which it is, since
> -# not all implementations provide the %pointer and %array declarations.
> -ac_cv_prog_lex_yytext_pointer=no
> -ac_save_LIBS=$LIBS
> -LIBS="$LEXLIB $ac_save_LIBS"
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-ll  $LIBS"
>  cat >conftest.$ac_ext <<_ACEOF
> -#define YYTEXT_POINTER 1
> -`cat $LEX_OUTPUT_ROOT.c`
> +/* confdefs.h.  */
> +_ACEOF
> +cat confdefs.h >>conftest.$ac_ext
> +cat >>conftest.$ac_ext <<_ACEOF
> +/* end confdefs.h.  */
> +
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char yywrap ();
> +int
> +main ()
> +{
> +return yywrap ();
> +  ;
> +  return 0;
> +}
>  _ACEOF
>  rm -f conftest.$ac_objext conftest$ac_exeext
>  if { (ac_try="$ac_link"
> @@ -6140,22 +6490,147 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> -  ac_cv_prog_lex_yytext_pointer=yes
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
> +  ac_cv_lib_l_yywrap=yes
>  else
>   echo "$as_me: failed program was:" >&5
>  sed 's/^/| /' conftest.$ac_ext >&5
>
> -
> +       ac_cv_lib_l_yywrap=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_save_LIBS
> +LIBS=$ac_check_lib_save_LIBS
> +fi
> +{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
> +echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
> +if test $ac_cv_lib_l_yywrap = yes; then
> +  LEXLIB="-ll"
> +fi
> +
> +fi
> +
> +fi
> +
> +if test "x$LEX" != "x:"; then
> +  { echo "$as_me:$LINENO: checking lex output file root" >&5
> +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
> +if test "${ac_cv_prog_lex_root+set}" = set; then
> +  echo $ECHO_N "(cached) $ECHO_C" >&6
> +else
> +  # The minimal lex program is just a single line: %%.  But some broken lexes
> +# (Solaris, I think it was) want two %% lines, so accommodate them.
> +cat >conftest.l <<_ACEOF
> +%%
> +%%
> +_ACEOF
> +{ (ac_try="$LEX conftest.l"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$LEX conftest.l") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }
> +if test -f lex.yy.c; then
> +  ac_cv_prog_lex_root=lex.yy
> +elif test -f lexyy.c; then
> +  ac_cv_prog_lex_root=lexyy
> +else
> +  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
> +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
> +   { (exit 1); exit 1; }; }
> +fi
> +fi
> +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
> +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
> +rm -f conftest.l
> +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
> +
> +{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
> +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
> +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
> +  echo $ECHO_N "(cached) $ECHO_C" >&6
> +else
> +  # POSIX says lex can declare yytext either as a pointer or an array; the
> +# default is implementation-dependent. Figure out which it is, since
> +# not all implementations provide the %pointer and %array declarations.
> +ac_cv_prog_lex_yytext_pointer=no
> +echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
> +ac_save_LIBS=$LIBS
> +LIBS="$LIBS $LEXLIB"
> +cat >conftest.$ac_ext <<_ACEOF
> +`cat $LEX_OUTPUT_ROOT.c`
> +_ACEOF
> +rm -f conftest.$ac_objext conftest$ac_exeext
> +if { (ac_try="$ac_link"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_link") 2>conftest.er1
> +  ac_status=$?
> +  grep -v '^ *+' conftest.er1 >conftest.err
> +  rm -f conftest.er1
> +  cat conftest.err >&5
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
> +  ac_cv_prog_lex_yytext_pointer=yes
> +else
> +  echo "$as_me: failed program was:" >&5
> +sed 's/^/| /' conftest.$ac_ext >&5
> +
> +
> +fi
> +
> +rm -f core conftest.err conftest.$ac_objext \
> +      conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_save_LIBS
> +rm -f "${LEX_OUTPUT_ROOT}.c"
>
>  fi
>  { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
> @@ -6167,7 +6642,6 @@
>  _ACEOF
>
>  fi
> -rm -f conftest.l $LEX_OUTPUT_ROOT.c
>
>  fi
>
> @@ -6206,7 +6680,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_YACC="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6353,7 +6827,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6394,7 +6868,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6435,7 +6909,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6476,7 +6950,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6517,7 +6991,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6558,7 +7032,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6599,7 +7073,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6639,7 +7113,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6679,7 +7153,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_RANLIB="ranlib"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6736,7 +7210,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6777,7 +7251,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6818,7 +7292,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6859,7 +7333,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_BINPWD="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6901,7 +7375,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_GRAPHVIZ="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -6957,7 +7431,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7015,7 +7489,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_GV="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7074,7 +7548,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_DOTTY="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7132,7 +7606,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7216,7 +7690,7 @@
>     # by default.
>     for ac_prog in ginstall scoinst install; do
>       for ac_exec_ext in '' $ac_executable_extensions; do
> -       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
> +       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
>          if test $ac_prog = install &&
>            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
>            # AIX install.  It has an incompatible calling convention.
> @@ -7279,7 +7753,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7319,7 +7793,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7359,7 +7833,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_GROFF="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7399,7 +7873,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7439,7 +7913,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_POD2HTML="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7479,7 +7953,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7519,7 +7993,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_RUNTEST="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7592,7 +8066,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7649,7 +8123,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7691,7 +8165,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_OCAMLC="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7736,7 +8210,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_OCAMLOPT="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7781,7 +8255,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_OCAMLDEP="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7826,7 +8300,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_OCAMLDOC="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7871,7 +8345,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
> -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_GAS="$as_dir/$ac_word$ac_exec_ext"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
> @@ -7938,11 +8412,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   llvm_cv_link_use_r=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -7951,7 +8441,7 @@
>        llvm_cv_link_use_r=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>   CFLAGS="$oldcflags"
>   ac_ext=c
> @@ -7994,10 +8484,10 @@
>  #ifndef __cplusplus
>   /* Ultrix mips cc rejects this.  */
>   typedef int charset[2];
> -  const charset cs;
> +  const charset x;
>   /* SunOS 4.1.1 cc rejects this.  */
> -  char const *const *pcpcc;
> -  char **ppc;
> +  char const *const *ccp;
> +  char **p;
>   /* NEC SVR4.0.2 mips cc rejects this.  */
>   struct point {int x, y;};
>   static struct point const zero = {0,0};
> @@ -8006,11 +8496,11 @@
>      an arm of an if-expression whose if-part is not a constant
>      expression */
>   const char *g = "string";
> -  pcpcc = &g + (g ? g-g : 0);
> +  ccp = &g + (g ? g-g : 0);
>   /* HPUX 7.0 cc rejects these. */
> -  ++pcpcc;
> -  ppc = (char**) pcpcc;
> -  pcpcc = (char const *const *) ppc;
> +  ++ccp;
> +  p = (char**) ccp;
> +  ccp = (char const *const *) p;
>   { /* SCO 3.2v4 cc rejects this.  */
>     char *t;
>     char const *s = 0 ? (char *) 0 : (char const *) 0;
> @@ -8037,7 +8527,7 @@
>     const int foo = 10;
>     if (!foo) return 0;
>   }
> -  return !cs[0] && !zero.x;
> +  return !x[0] && !zero.x;
>  #endif
>
>   ;
> @@ -8057,10 +8547,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_c_const=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -8125,10 +8632,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_Header=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -8201,11 +8725,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_search_opendir=$ac_res
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -8214,7 +8754,7 @@
>
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext
>   if test "${ac_cv_search_opendir+set}" = set; then
>   break
> @@ -8285,11 +8825,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_search_opendir=$ac_res
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -8298,7 +8854,7 @@
>
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext
>   if test "${ac_cv_search_opendir+set}" = set; then
>   break
> @@ -8361,10 +8917,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_header_compiler=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -8400,10 +8973,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   ac_header_preproc=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9497,11 +10077,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_func_shl_load=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9510,7 +10106,7 @@
>        ac_cv_func_shl_load=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  fi
>  { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
> @@ -9564,11 +10160,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_lib_dld_shl_load=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9577,7 +10189,7 @@
>        ac_cv_lib_dld_shl_load=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  LIBS=$ac_check_lib_save_LIBS
>  fi
> @@ -9633,11 +10245,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_lib_dl_dlopen=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9646,7 +10274,7 @@
>        ac_cv_lib_dl_dlopen=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  LIBS=$ac_check_lib_save_LIBS
>  fi
> @@ -9691,11 +10319,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>
>  cat >>confdefs.h <<\_ACEOF
>  #define HAVE_LIBDL 1
> @@ -9747,11 +10391,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_lib_svld_dlopen=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9760,7 +10420,7 @@
>        ac_cv_lib_svld_dlopen=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  LIBS=$ac_check_lib_save_LIBS
>  fi
> @@ -9816,11 +10476,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_lib_dld_dld_link=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9829,7 +10505,7 @@
>        ac_cv_lib_dld_dld_link=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  LIBS=$ac_check_lib_save_LIBS
>  fi
> @@ -9906,11 +10582,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_func__dyld_func_lookup=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -9919,7 +10611,7 @@
>        ac_cv_func__dyld_func_lookup=no
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  fi
>  { echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
> @@ -9941,7 +10633,7 @@
>
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>
>  fi
> @@ -10024,11 +10716,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_var=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10037,7 +10745,7 @@
>        eval "$as_ac_var=no"
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  fi
>  ac_res=`eval echo '${'$as_ac_var'}'`
> @@ -10124,7 +10832,7 @@
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
> -#line 10127 "configure"
> +#line 10835 "configure"
>  #include "confdefs.h"
>
>  #if HAVE_DLFCN_H
> @@ -10353,10 +11061,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_header_compiler=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10392,10 +11117,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   ac_header_preproc=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10500,10 +11232,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_cv_type_error_t=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10603,11 +11352,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_var=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10616,7 +11381,7 @@
>        eval "$as_ac_var=no"
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  fi
>  ac_res=`eval echo '${'$as_ac_var'}'`
> @@ -10696,10 +11461,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_header_compiler=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10735,10 +11517,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   ac_header_preproc=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10844,10 +11633,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_header_compiler=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10883,10 +11689,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   ac_header_preproc=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -10990,10 +11803,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest.$ac_objext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest.$ac_objext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   ac_header_compiler=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -11029,10 +11859,17 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } >/dev/null && {
> -        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       }; then
> +  (exit $ac_status); } >/dev/null; then
> +  if test -s conftest.err; then
> +    ac_cpp_err=$ac_c_preproc_warn_flag
> +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
> +  else
> +    ac_cpp_err=
> +  fi
> +else
> +  ac_cpp_err=yes
> +fi
> +if test -z "$ac_cpp_err"; then
>   ac_header_preproc=yes
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -11165,11 +12002,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_var=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -11178,7 +12031,7 @@
>        eval "$as_ac_var=no"
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  fi
>  ac_res=`eval echo '${'$as_ac_var'}'`
> @@ -11260,11 +12113,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_var=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -11273,7 +12142,7 @@
>        eval "$as_ac_var=no"
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
>  fi
>  ac_res=`eval echo '${'$as_ac_var'}'`
> @@ -11355,11 +12224,27 @@
>   rm -f conftest.er1
>   cat conftest.err >&5
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -  (exit $ac_status); } && {
> -        test -z "$ac_c_werror_flag" ||
> -        test ! -s conftest.err
> -       } && test -s conftest$ac_exeext &&
> -       $as_test_x conftest$ac_exeext; then
> +  (exit $ac_status); } &&
> +        { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; } &&
> +        { ac_try='test -s conftest$ac_exeext'
> +  { (case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +  (exit $ac_status); }; }; then
>   eval "$as_ac_var=yes"
>  else
>   echo "$as_me: failed program was:" >&5
> @@ -11368,7 +12253,7 @@
>        eval "$as_ac_var=no"
>  fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +rm -f core conft...
>
> [Message clipped]



More information about the llvm-commits mailing list