Fixed compiler warnings and regenerated autotools files
authorSam Lantinga <slouken@libsdl.org>
Wed, 09 Oct 2019 18:35:39 -0700
changeset 72263ec5ac0b0b8
parent 721 2ab0052024a3
child 723 1239eed726ae
Fixed compiler warnings and regenerated autotools files
IMG_gif.c
Makefile.in
aclocal.m4
configure
     1.1 --- a/IMG_gif.c	Wed Oct 09 17:25:15 2019 -0700
     1.2 +++ b/IMG_gif.c	Wed Oct 09 18:35:39 2019 -0700
     1.3 @@ -202,7 +202,6 @@
     1.4  Anim_t *
     1.5  IMG_LoadGIF_RW_Internal(SDL_RWops *src, SDL_bool load_anim)
     1.6  {
     1.7 -    Sint64 start;
     1.8      unsigned char buf[16];
     1.9      unsigned char c;
    1.10      unsigned char localColorMap[3][MAXCOLORMAPSIZE];
    1.11 @@ -222,7 +221,6 @@
    1.12      if (src == NULL) {
    1.13          return NULL;
    1.14      }
    1.15 -    start = SDL_RWtell(src);
    1.16  
    1.17      anim = (Anim_t *)SDL_calloc(1, sizeof(*anim));
    1.18      if (!anim) {
    1.19 @@ -332,7 +330,11 @@
    1.20              frame->x = LM_to_uint(buf[0], buf[1]);
    1.21              frame->y = LM_to_uint(buf[2], buf[3]);
    1.22              frame->disposal = state.Gif89.disposal;
    1.23 -            frame->delay = (state.Gif89.delayTime < 2 ? 10 : state.Gif89.delayTime) * 10;
    1.24 +            if (state.Gif89.delayTime < 2) {
    1.25 +                frame->delay = 100; /* Default animation delay, matching browsers and Qt */
    1.26 +            } else {
    1.27 +                frame->delay = state.Gif89.delayTime * 10;
    1.28 +            }
    1.29  
    1.30              if (!load_anim) {
    1.31                  /* We only need one frame, we're done */
    1.32 @@ -397,39 +399,32 @@
    1.33  DoExtension(SDL_RWops *src, int label, State_t * state)
    1.34  {
    1.35      unsigned char buf[256];
    1.36 -    char *str;
    1.37  
    1.38      switch (label) {
    1.39      case 0x01:          /* Plain Text Extension */
    1.40 -        str = "Plain Text Extension";
    1.41          break;
    1.42      case 0xff:          /* Application Extension */
    1.43 -        str = "Application Extension";
    1.44          break;
    1.45      case 0xfe:          /* Comment Extension */
    1.46 -        str = "Comment Extension";
    1.47 -        while (GetDataBlock(src, (unsigned char *) buf, state) > 0)
    1.48 +        while (GetDataBlock(src, buf, state) > 0)
    1.49              ;
    1.50          return FALSE;
    1.51      case 0xf9:          /* Graphic Control Extension */
    1.52 -        str = "Graphic Control Extension";
    1.53 -        (void) GetDataBlock(src, (unsigned char *) buf, state);
    1.54 +        (void) GetDataBlock(src, buf, state);
    1.55          state->Gif89.disposal = (buf[0] >> 2) & 0x7;
    1.56          state->Gif89.inputFlag = (buf[0] >> 1) & 0x1;
    1.57          state->Gif89.delayTime = LM_to_uint(buf[1], buf[2]);
    1.58          if ((buf[0] & 0x1) != 0)
    1.59              state->Gif89.transparent = buf[3];
    1.60  
    1.61 -        while (GetDataBlock(src, (unsigned char *) buf, state) > 0)
    1.62 +        while (GetDataBlock(src, buf, state) > 0)
    1.63              ;
    1.64          return FALSE;
    1.65      default:
    1.66 -        str = (char *)buf;
    1.67 -        SDL_snprintf(str, 256, "UNKNOWN (0x%02x)", label);
    1.68          break;
    1.69      }
    1.70  
    1.71 -    while (GetDataBlock(src, (unsigned char *) buf, state) > 0)
    1.72 +    while (GetDataBlock(src, buf, state) > 0)
    1.73          ;
    1.74  
    1.75      return FALSE;
     2.1 --- a/Makefile.in	Wed Oct 09 17:25:15 2019 -0700
     2.2 +++ b/Makefile.in	Wed Oct 09 18:35:39 2019 -0700
     2.3 @@ -1,4 +1,4 @@
     2.4 -# Makefile.in generated by automake 1.16.1 from Makefile.am.
     2.5 +# Makefile.in generated by automake 1.16 from Makefile.am.
     2.6  # @configure_input@
     2.7  
     2.8  # Copyright (C) 1994-2018 Free Software Foundation, Inc.
     2.9 @@ -264,8 +264,8 @@
    2.10  CSCOPE = cscope
    2.11  AM_RECURSIVE_TARGETS = cscope
    2.12  am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SDL2_image.pc.in \
    2.13 -	$(srcdir)/SDL2_image.spec.in compile config.guess config.sub \
    2.14 -	depcomp install-sh ltmain.sh missing
    2.15 +	$(srcdir)/SDL2_image.spec.in ar-lib compile config.guess \
    2.16 +	config.sub depcomp install-sh ltmain.sh missing
    2.17  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    2.18  distdir = $(PACKAGE)-$(VERSION)
    2.19  top_distdir = $(distdir)
     3.1 --- a/aclocal.m4	Wed Oct 09 17:25:15 2019 -0700
     3.2 +++ b/aclocal.m4	Wed Oct 09 18:35:39 2019 -0700
     3.3 @@ -1,4 +1,4 @@
     3.4 -# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
     3.5 +# generated automatically by aclocal 1.16 -*- Autoconf -*-
     3.6  
     3.7  # Copyright (C) 1996-2018 Free Software Foundation, Inc.
     3.8  
     3.9 @@ -14,12 +14,112 @@
    3.10  m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
    3.11  m4_ifndef([AC_AUTOCONF_VERSION],
    3.12    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    3.13 -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
    3.14 -[m4_warning([this file was generated for autoconf 2.65.
    3.15 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
    3.16 +[m4_warning([this file was generated for autoconf 2.69.
    3.17  You have another version of autoconf.  It may work, but is not guaranteed to.
    3.18  If you have problems, you may need to regenerate the build system entirely.
    3.19  To do so, use the procedure documented by the package, typically 'autoreconf'.])])
    3.20  
    3.21 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
    3.22 +#
    3.23 +#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
    3.24 +#   Foundation, Inc.
    3.25 +#   Written by Scott James Remnant, 2004.
    3.26 +#
    3.27 +# This file is free software; the Free Software Foundation gives
    3.28 +# unlimited permission to copy and/or distribute it, with or without
    3.29 +# modifications, as long as this notice is preserved.
    3.30 +
    3.31 +# serial 5 lt~obsolete.m4
    3.32 +
    3.33 +# These exist entirely to fool aclocal when bootstrapping libtool.
    3.34 +#
    3.35 +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
    3.36 +# which have later been changed to m4_define as they aren't part of the
    3.37 +# exported API, or moved to Autoconf or Automake where they belong.
    3.38 +#
    3.39 +# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
    3.40 +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
    3.41 +# using a macro with the same name in our local m4/libtool.m4 it'll
    3.42 +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
    3.43 +# and doesn't know about Autoconf macros at all.)
    3.44 +#
    3.45 +# So we provide this file, which has a silly filename so it's always
    3.46 +# included after everything else.  This provides aclocal with the
    3.47 +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
    3.48 +# because those macros already exist, or will be overwritten later.
    3.49 +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
    3.50 +#
    3.51 +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
    3.52 +# Yes, that means every name once taken will need to remain here until
    3.53 +# we give up compatibility with versions before 1.7, at which point
    3.54 +# we need to keep only those names which we still refer to.
    3.55 +
    3.56 +# This is to help aclocal find these macros, as it can't see m4_define.
    3.57 +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
    3.58 +
    3.59 +m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
    3.60 +m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
    3.61 +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
    3.62 +m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
    3.63 +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
    3.64 +m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
    3.65 +m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
    3.66 +m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
    3.67 +m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
    3.68 +m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
    3.69 +m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
    3.70 +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
    3.71 +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
    3.72 +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
    3.73 +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
    3.74 +m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
    3.75 +m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
    3.76 +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
    3.77 +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
    3.78 +m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
    3.79 +m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
    3.80 +m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
    3.81 +m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
    3.82 +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
    3.83 +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
    3.84 +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
    3.85 +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
    3.86 +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
    3.87 +m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
    3.88 +m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
    3.89 +m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
    3.90 +m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
    3.91 +m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
    3.92 +m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
    3.93 +m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
    3.94 +m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
    3.95 +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
    3.96 +m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
    3.97 +m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
    3.98 +m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
    3.99 +m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
   3.100 +m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
   3.101 +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
   3.102 +m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
   3.103 +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
   3.104 +m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
   3.105 +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
   3.106 +m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
   3.107 +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
   3.108 +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
   3.109 +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
   3.110 +m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
   3.111 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
   3.112 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
   3.113 +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
   3.114 +m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
   3.115 +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
   3.116 +m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
   3.117 +m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
   3.118 +m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
   3.119 +m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
   3.120 +
   3.121  # Copyright (C) 2002-2018 Free Software Foundation, Inc.
   3.122  #
   3.123  # This file is free software; the Free Software Foundation
   3.124 @@ -35,7 +135,7 @@
   3.125  [am__api_version='1.16'
   3.126  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
   3.127  dnl require some minimum version.  Point them to the right macro.
   3.128 -m4_if([$1], [1.16.1], [],
   3.129 +m4_if([$1], [1.16], [],
   3.130        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
   3.131  ])
   3.132  
   3.133 @@ -51,7 +151,7 @@
   3.134  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
   3.135  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
   3.136  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
   3.137 -[AM_AUTOMAKE_VERSION([1.16.1])dnl
   3.138 +[AM_AUTOMAKE_VERSION([1.16])dnl
   3.139  m4_ifndef([AC_AUTOCONF_VERSION],
   3.140    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
   3.141  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
     4.1 --- a/configure	Wed Oct 09 17:25:15 2019 -0700
     4.2 +++ b/configure	Wed Oct 09 18:35:39 2019 -0700
     4.3 @@ -1,11 +1,9 @@
     4.4  #! /bin/sh
     4.5  # Guess values for system-dependent variables and create Makefiles.
     4.6 -# Generated by GNU Autoconf 2.65.
     4.7 +# Generated by GNU Autoconf 2.69.
     4.8  #
     4.9  #
    4.10 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    4.11 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
    4.12 -# Inc.
    4.13 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
    4.14  #
    4.15  #
    4.16  # This configure script is free software; the Free Software Foundation
    4.17 @@ -89,6 +87,7 @@
    4.18  IFS=" ""	$as_nl"
    4.19  
    4.20  # Find who we are.  Look in the path if we contain no directory separator.
    4.21 +as_myself=
    4.22  case $0 in #((
    4.23    *[\\/]* ) as_myself=$0 ;;
    4.24    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    4.25 @@ -133,6 +132,31 @@
    4.26  # CDPATH.
    4.27  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
    4.28  
    4.29 +# Use a proper internal environment variable to ensure we don't fall
    4.30 +  # into an infinite loop, continuously re-executing ourselves.
    4.31 +  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
    4.32 +    _as_can_reexec=no; export _as_can_reexec;
    4.33 +    # We cannot yet assume a decent shell, so we have to provide a
    4.34 +# neutralization value for shells without unset; and this also
    4.35 +# works around shells that cannot unset nonexistent variables.
    4.36 +# Preserve -v and -x to the replacement shell.
    4.37 +BASH_ENV=/dev/null
    4.38 +ENV=/dev/null
    4.39 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    4.40 +case $- in # ((((
    4.41 +  *v*x* | *x*v* ) as_opts=-vx ;;
    4.42 +  *v* ) as_opts=-v ;;
    4.43 +  *x* ) as_opts=-x ;;
    4.44 +  * ) as_opts= ;;
    4.45 +esac
    4.46 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    4.47 +# Admittedly, this is quite paranoid, since all the known shells bail
    4.48 +# out after a failed `exec'.
    4.49 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    4.50 +as_fn_exit 255
    4.51 +  fi
    4.52 +  # We don't want this to propagate to other subprocesses.
    4.53 +          { _as_can_reexec=; unset _as_can_reexec;}
    4.54  if test "x$CONFIG_SHELL" = x; then
    4.55    as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
    4.56    emulate sh
    4.57 @@ -166,7 +190,8 @@
    4.58  else
    4.59    exitcode=1; echo positional parameters were not saved.
    4.60  fi
    4.61 -test x\$exitcode = x0 || exit 1"
    4.62 +test x\$exitcode = x0 || exit 1
    4.63 +test -x / || exit 1"
    4.64    as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    4.65    as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
    4.66    eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
    4.67 @@ -211,14 +236,25 @@
    4.68  
    4.69  
    4.70        if test "x$CONFIG_SHELL" != x; then :
    4.71 -  # We cannot yet assume a decent shell, so we have to provide a
    4.72 -	# neutralization value for shells without unset; and this also
    4.73 -	# works around shells that cannot unset nonexistent variables.
    4.74 -	BASH_ENV=/dev/null
    4.75 -	ENV=/dev/null
    4.76 -	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    4.77 -	export CONFIG_SHELL
    4.78 -	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
    4.79 +  export CONFIG_SHELL
    4.80 +             # We cannot yet assume a decent shell, so we have to provide a
    4.81 +# neutralization value for shells without unset; and this also
    4.82 +# works around shells that cannot unset nonexistent variables.
    4.83 +# Preserve -v and -x to the replacement shell.
    4.84 +BASH_ENV=/dev/null
    4.85 +ENV=/dev/null
    4.86 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    4.87 +case $- in # ((((
    4.88 +  *v*x* | *x*v* ) as_opts=-vx ;;
    4.89 +  *v* ) as_opts=-v ;;
    4.90 +  *x* ) as_opts=-x ;;
    4.91 +  * ) as_opts= ;;
    4.92 +esac
    4.93 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    4.94 +# Admittedly, this is quite paranoid, since all the known shells bail
    4.95 +# out after a failed `exec'.
    4.96 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    4.97 +exit 255
    4.98  fi
    4.99  
   4.100      if test x$as_have_required = xno; then :
   4.101 @@ -316,10 +352,18 @@
   4.102        test -d "$as_dir" && break
   4.103      done
   4.104      test -z "$as_dirs" || eval "mkdir $as_dirs"
   4.105 -  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
   4.106 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
   4.107  
   4.108  
   4.109  } # as_fn_mkdir_p
   4.110 +
   4.111 +# as_fn_executable_p FILE
   4.112 +# -----------------------
   4.113 +# Test if FILE is an executable regular file.
   4.114 +as_fn_executable_p ()
   4.115 +{
   4.116 +  test -f "$1" && test -x "$1"
   4.117 +} # as_fn_executable_p
   4.118  # as_fn_append VAR VALUE
   4.119  # ----------------------
   4.120  # Append the text in VALUE to the end of the definition contained in VAR. Take
   4.121 @@ -356,19 +400,19 @@
   4.122  fi # as_fn_arith
   4.123  
   4.124  
   4.125 -# as_fn_error ERROR [LINENO LOG_FD]
   4.126 -# ---------------------------------
   4.127 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
   4.128 +# ----------------------------------------
   4.129  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
   4.130  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
   4.131 -# script with status $?, using 1 if that was 0.
   4.132 +# script with STATUS, using 1 if that was 0.
   4.133  as_fn_error ()
   4.134  {
   4.135 -  as_status=$?; test $as_status -eq 0 && as_status=1
   4.136 -  if test "$3"; then
   4.137 -    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   4.138 -    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   4.139 -  fi
   4.140 -  $as_echo "$as_me: error: $1" >&2
   4.141 +  as_status=$1; test $as_status -eq 0 && as_status=1
   4.142 +  if test "$4"; then
   4.143 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   4.144 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   4.145 +  fi
   4.146 +  $as_echo "$as_me: error: $2" >&2
   4.147    as_fn_exit $as_status
   4.148  } # as_fn_error
   4.149  
   4.150 @@ -441,6 +485,10 @@
   4.151    chmod +x "$as_me.lineno" ||
   4.152      { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
   4.153  
   4.154 +  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   4.155 +  # already done that, so ensure we don't try to do so again and fall
   4.156 +  # in an infinite loop.  This has already happened in practice.
   4.157 +  _as_can_reexec=no; export _as_can_reexec
   4.158    # Don't try to exec as it changes $[0], causing all sort of problems
   4.159    # (the dirname of $[0] is not the place where we might find the
   4.160    # original and so on.  Autoconf is especially sensitive to this).
   4.161 @@ -475,16 +523,16 @@
   4.162      # ... but there are two gotchas:
   4.163      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
   4.164      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
   4.165 -    # In both cases, we have to default to `cp -p'.
   4.166 +    # In both cases, we have to default to `cp -pR'.
   4.167      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
   4.168 -      as_ln_s='cp -p'
   4.169 +      as_ln_s='cp -pR'
   4.170    elif ln conf$$.file conf$$ 2>/dev/null; then
   4.171      as_ln_s=ln
   4.172    else
   4.173 -    as_ln_s='cp -p'
   4.174 -  fi
   4.175 -else
   4.176 -  as_ln_s='cp -p'
   4.177 +    as_ln_s='cp -pR'
   4.178 +  fi
   4.179 +else
   4.180 +  as_ln_s='cp -pR'
   4.181  fi
   4.182  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
   4.183  rmdir conf$$.dir 2>/dev/null
   4.184 @@ -496,28 +544,8 @@
   4.185    as_mkdir_p=false
   4.186  fi
   4.187  
   4.188 -if test -x / >/dev/null 2>&1; then
   4.189 -  as_test_x='test -x'
   4.190 -else
   4.191 -  if ls -dL / >/dev/null 2>&1; then
   4.192 -    as_ls_L_option=L
   4.193 -  else
   4.194 -    as_ls_L_option=
   4.195 -  fi
   4.196 -  as_test_x='
   4.197 -    eval sh -c '\''
   4.198 -      if test -d "$1"; then
   4.199 -	test -d "$1/.";
   4.200 -      else
   4.201 -	case $1 in #(
   4.202 -	-*)set "./$1";;
   4.203 -	esac;
   4.204 -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
   4.205 -	???[sx]*):;;*)false;;esac;fi
   4.206 -    '\'' sh
   4.207 -  '
   4.208 -fi
   4.209 -as_executable_p=$as_test_x
   4.210 +as_test_x='test -x'
   4.211 +as_executable_p=as_fn_executable_p
   4.212  
   4.213  # Sed expression to map a string onto a valid CPP name.
   4.214  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
   4.215 @@ -679,7 +707,7 @@
   4.216  exec 6>&1
   4.217  
   4.218  # Name of the host.
   4.219 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
   4.220 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
   4.221  # so uname gets run too.
   4.222  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
   4.223  
   4.224 @@ -1001,8 +1029,9 @@
   4.225    fi
   4.226  
   4.227    case $ac_option in
   4.228 -  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
   4.229 -  *)	ac_optarg=yes ;;
   4.230 +  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
   4.231 +  *=)   ac_optarg= ;;
   4.232 +  *)    ac_optarg=yes ;;
   4.233    esac
   4.234  
   4.235    # Accept the important Cygnus configure options, so we can diagnose typos.
   4.236 @@ -1047,7 +1076,7 @@
   4.237      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
   4.238      # Reject names that are not valid shell variable names.
   4.239      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   4.240 -      as_fn_error "invalid feature name: $ac_useropt"
   4.241 +      as_fn_error $? "invalid feature name: $ac_useropt"
   4.242      ac_useropt_orig=$ac_useropt
   4.243      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   4.244      case $ac_user_opts in
   4.245 @@ -1073,7 +1102,7 @@
   4.246      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
   4.247      # Reject names that are not valid shell variable names.
   4.248      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   4.249 -      as_fn_error "invalid feature name: $ac_useropt"
   4.250 +      as_fn_error $? "invalid feature name: $ac_useropt"
   4.251      ac_useropt_orig=$ac_useropt
   4.252      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   4.253      case $ac_user_opts in
   4.254 @@ -1277,7 +1306,7 @@
   4.255      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
   4.256      # Reject names that are not valid shell variable names.
   4.257      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   4.258 -      as_fn_error "invalid package name: $ac_useropt"
   4.259 +      as_fn_error $? "invalid package name: $ac_useropt"
   4.260      ac_useropt_orig=$ac_useropt
   4.261      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   4.262      case $ac_user_opts in
   4.263 @@ -1293,7 +1322,7 @@
   4.264      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
   4.265      # Reject names that are not valid shell variable names.
   4.266      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   4.267 -      as_fn_error "invalid package name: $ac_useropt"
   4.268 +      as_fn_error $? "invalid package name: $ac_useropt"
   4.269      ac_useropt_orig=$ac_useropt
   4.270      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   4.271      case $ac_user_opts in
   4.272 @@ -1323,8 +1352,8 @@
   4.273    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
   4.274      x_libraries=$ac_optarg ;;
   4.275  
   4.276 -  -*) as_fn_error "unrecognized option: \`$ac_option'
   4.277 -Try \`$0 --help' for more information."
   4.278 +  -*) as_fn_error $? "unrecognized option: \`$ac_option'
   4.279 +Try \`$0 --help' for more information"
   4.280      ;;
   4.281  
   4.282    *=*)
   4.283 @@ -1332,7 +1361,7 @@
   4.284      # Reject names that are not valid shell variable names.
   4.285      case $ac_envvar in #(
   4.286        '' | [0-9]* | *[!_$as_cr_alnum]* )
   4.287 -      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
   4.288 +      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
   4.289      esac
   4.290      eval $ac_envvar=\$ac_optarg
   4.291      export $ac_envvar ;;
   4.292 @@ -1342,7 +1371,7 @@
   4.293      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
   4.294      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   4.295        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
   4.296 -    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
   4.297 +    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
   4.298      ;;
   4.299  
   4.300    esac
   4.301 @@ -1350,13 +1379,13 @@
   4.302  
   4.303  if test -n "$ac_prev"; then
   4.304    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
   4.305 -  as_fn_error "missing argument to $ac_option"
   4.306 +  as_fn_error $? "missing argument to $ac_option"
   4.307  fi
   4.308  
   4.309  if test -n "$ac_unrecognized_opts"; then
   4.310    case $enable_option_checking in
   4.311      no) ;;
   4.312 -    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
   4.313 +    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
   4.314      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   4.315    esac
   4.316  fi
   4.317 @@ -1379,7 +1408,7 @@
   4.318      [\\/$]* | ?:[\\/]* )  continue;;
   4.319      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   4.320    esac
   4.321 -  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
   4.322 +  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
   4.323  done
   4.324  
   4.325  # There might be people who depend on the old broken behavior: `$host'
   4.326 @@ -1393,8 +1422,6 @@
   4.327  if test "x$host_alias" != x; then
   4.328    if test "x$build_alias" = x; then
   4.329      cross_compiling=maybe
   4.330 -    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
   4.331 -    If a cross compiler is detected then cross compile mode will be used." >&2
   4.332    elif test "x$build_alias" != "x$host_alias"; then
   4.333      cross_compiling=yes
   4.334    fi
   4.335 @@ -1409,9 +1436,9 @@
   4.336  ac_pwd=`pwd` && test -n "$ac_pwd" &&
   4.337  ac_ls_di=`ls -di .` &&
   4.338  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
   4.339 -  as_fn_error "working directory cannot be determined"
   4.340 +  as_fn_error $? "working directory cannot be determined"
   4.341  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   4.342 -  as_fn_error "pwd does not report name of working directory"
   4.343 +  as_fn_error $? "pwd does not report name of working directory"
   4.344  
   4.345  
   4.346  # Find the source files, if location was not specified.
   4.347 @@ -1450,11 +1477,11 @@
   4.348  fi
   4.349  if test ! -r "$srcdir/$ac_unique_file"; then
   4.350    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   4.351 -  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
   4.352 +  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
   4.353  fi
   4.354  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
   4.355  ac_abs_confdir=`(
   4.356 -	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
   4.357 +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
   4.358  	pwd)`
   4.359  # When building in place, set srcdir=.
   4.360  if test "$ac_abs_confdir" = "$ac_pwd"; then
   4.361 @@ -1494,7 +1521,7 @@
   4.362        --help=short        display options specific to this package
   4.363        --help=recursive    display the short help of all the included packages
   4.364    -V, --version           display version information and exit
   4.365 -  -q, --quiet, --silent   do not print \`checking...' messages
   4.366 +  -q, --quiet, --silent   do not print \`checking ...' messages
   4.367        --cache-file=FILE   cache test results in FILE [disabled]
   4.368    -C, --config-cache      alias for \`--cache-file=config.cache'
   4.369    -n, --no-create         do not create output files
   4.370 @@ -1689,9 +1716,9 @@
   4.371  if $ac_init_version; then
   4.372    cat <<\_ACEOF
   4.373  configure
   4.374 -generated by GNU Autoconf 2.65
   4.375 -
   4.376 -Copyright (C) 2009 Free Software Foundation, Inc.
   4.377 +generated by GNU Autoconf 2.69
   4.378 +
   4.379 +Copyright (C) 2012 Free Software Foundation, Inc.
   4.380  This configure script is free software; the Free Software Foundation
   4.381  gives unlimited permission to copy, distribute and modify it.
   4.382  _ACEOF
   4.383 @@ -1735,7 +1762,7 @@
   4.384  
   4.385  	ac_retval=1
   4.386  fi
   4.387 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.388 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.389    as_fn_set_status $ac_retval
   4.390  
   4.391  } # ac_fn_c_try_compile
   4.392 @@ -1767,7 +1794,7 @@
   4.393  	 test ! -s conftest.err
   4.394         } && test -s conftest$ac_exeext && {
   4.395  	 test "$cross_compiling" = yes ||
   4.396 -	 $as_test_x conftest$ac_exeext
   4.397 +	 test -x conftest$ac_exeext
   4.398         }; then :
   4.399    ac_retval=0
   4.400  else
   4.401 @@ -1781,7 +1808,7 @@
   4.402    # interfere with the next link command; also delete a directory that is
   4.403    # left behind by Apple's compiler.  We do this before executing the actions.
   4.404    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   4.405 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.406 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.407    as_fn_set_status $ac_retval
   4.408  
   4.409  } # ac_fn_c_try_link
   4.410 @@ -1795,7 +1822,7 @@
   4.411    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   4.412    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   4.413  $as_echo_n "checking for $2... " >&6; }
   4.414 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   4.415 +if eval \${$3+:} false; then :
   4.416    $as_echo_n "(cached) " >&6
   4.417  else
   4.418    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   4.419 @@ -1813,7 +1840,7 @@
   4.420  eval ac_res=\$$3
   4.421  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   4.422  $as_echo "$ac_res" >&6; }
   4.423 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.424 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.425  
   4.426  } # ac_fn_c_check_header_compile
   4.427  
   4.428 @@ -1838,7 +1865,7 @@
   4.429      mv -f conftest.er1 conftest.err
   4.430    fi
   4.431    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   4.432 -  test $ac_status = 0; } >/dev/null && {
   4.433 +  test $ac_status = 0; } > conftest.i && {
   4.434  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
   4.435  	 test ! -s conftest.err
   4.436         }; then :
   4.437 @@ -1849,7 +1876,7 @@
   4.438  
   4.439      ac_retval=1
   4.440  fi
   4.441 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.442 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.443    as_fn_set_status $ac_retval
   4.444  
   4.445  } # ac_fn_c_try_cpp
   4.446 @@ -1891,7 +1918,7 @@
   4.447         ac_retval=$ac_status
   4.448  fi
   4.449    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   4.450 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.451 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.452    as_fn_set_status $ac_retval
   4.453  
   4.454  } # ac_fn_c_try_run
   4.455 @@ -1904,7 +1931,7 @@
   4.456    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   4.457    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   4.458  $as_echo_n "checking for $2... " >&6; }
   4.459 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   4.460 +if eval \${$3+:} false; then :
   4.461    $as_echo_n "(cached) " >&6
   4.462  else
   4.463    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   4.464 @@ -1959,7 +1986,7 @@
   4.465  eval ac_res=\$$3
   4.466  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   4.467  $as_echo "$ac_res" >&6; }
   4.468 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.469 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.470  
   4.471  } # ac_fn_c_check_func
   4.472  
   4.473 @@ -1996,7 +2023,7 @@
   4.474  
   4.475  	ac_retval=1
   4.476  fi
   4.477 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.478 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.479    as_fn_set_status $ac_retval
   4.480  
   4.481  } # ac_fn_objc_try_compile
   4.482 @@ -2009,10 +2036,10 @@
   4.483  ac_fn_c_check_header_mongrel ()
   4.484  {
   4.485    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   4.486 -  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   4.487 +  if eval \${$3+:} false; then :
   4.488    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   4.489  $as_echo_n "checking for $2... " >&6; }
   4.490 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   4.491 +if eval \${$3+:} false; then :
   4.492    $as_echo_n "(cached) " >&6
   4.493  fi
   4.494  eval ac_res=\$$3
   4.495 @@ -2048,7 +2075,7 @@
   4.496  else
   4.497    ac_header_preproc=no
   4.498  fi
   4.499 -rm -f conftest.err conftest.$ac_ext
   4.500 +rm -f conftest.err conftest.i conftest.$ac_ext
   4.501  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
   4.502  $as_echo "$ac_header_preproc" >&6; }
   4.503  
   4.504 @@ -2075,7 +2102,7 @@
   4.505  esac
   4.506    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   4.507  $as_echo_n "checking for $2... " >&6; }
   4.508 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   4.509 +if eval \${$3+:} false; then :
   4.510    $as_echo_n "(cached) " >&6
   4.511  else
   4.512    eval "$3=\$ac_header_compiler"
   4.513 @@ -2084,7 +2111,7 @@
   4.514  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   4.515  $as_echo "$ac_res" >&6; }
   4.516  fi
   4.517 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   4.518 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   4.519  
   4.520  } # ac_fn_c_check_header_mongrel
   4.521  cat >config.log <<_ACEOF
   4.522 @@ -2092,7 +2119,7 @@
   4.523  running configure, to aid debugging if configure makes a mistake.
   4.524  
   4.525  It was created by $as_me, which was
   4.526 -generated by GNU Autoconf 2.65.  Invocation command line was
   4.527 +generated by GNU Autoconf 2.69.  Invocation command line was
   4.528  
   4.529    $ $0 $@
   4.530  
   4.531 @@ -2202,11 +2229,9 @@
   4.532    {
   4.533      echo
   4.534  
   4.535 -    cat <<\_ASBOX
   4.536 -## ---------------- ##
   4.537 +    $as_echo "## ---------------- ##
   4.538  ## Cache variables. ##
   4.539 -## ---------------- ##
   4.540 -_ASBOX
   4.541 +## ---------------- ##"
   4.542      echo
   4.543      # The following way of writing the cache mishandles newlines in values,
   4.544  (
   4.545 @@ -2240,11 +2265,9 @@
   4.546  )
   4.547      echo
   4.548  
   4.549 -    cat <<\_ASBOX
   4.550 -## ----------------- ##
   4.551 +    $as_echo "## ----------------- ##
   4.552  ## Output variables. ##
   4.553 -## ----------------- ##
   4.554 -_ASBOX
   4.555 +## ----------------- ##"
   4.556      echo
   4.557      for ac_var in $ac_subst_vars
   4.558      do
   4.559 @@ -2257,11 +2280,9 @@
   4.560      echo
   4.561  
   4.562      if test -n "$ac_subst_files"; then
   4.563 -      cat <<\_ASBOX
   4.564 -## ------------------- ##
   4.565 +      $as_echo "## ------------------- ##
   4.566  ## File substitutions. ##
   4.567 -## ------------------- ##
   4.568 -_ASBOX
   4.569 +## ------------------- ##"
   4.570        echo
   4.571        for ac_var in $ac_subst_files
   4.572        do
   4.573 @@ -2275,11 +2296,9 @@
   4.574      fi
   4.575  
   4.576      if test -s confdefs.h; then
   4.577 -      cat <<\_ASBOX
   4.578 -## ----------- ##
   4.579 +      $as_echo "## ----------- ##
   4.580  ## confdefs.h. ##
   4.581 -## ----------- ##
   4.582 -_ASBOX
   4.583 +## ----------- ##"
   4.584        echo
   4.585        cat confdefs.h
   4.586        echo
   4.587 @@ -2334,7 +2353,12 @@
   4.588  ac_site_file1=NONE
   4.589  ac_site_file2=NONE
   4.590  if test -n "$CONFIG_SITE"; then
   4.591 -  ac_site_file1=$CONFIG_SITE
   4.592 +  # We do not want a PATH search for config.site.
   4.593 +  case $CONFIG_SITE in #((
   4.594 +    -*)  ac_site_file1=./$CONFIG_SITE;;
   4.595 +    */*) ac_site_file1=$CONFIG_SITE;;
   4.596 +    *)   ac_site_file1=./$CONFIG_SITE;;
   4.597 +  esac
   4.598  elif test "x$prefix" != xNONE; then
   4.599    ac_site_file1=$prefix/share/config.site
   4.600    ac_site_file2=$prefix/etc/config.site
   4.601 @@ -2349,7 +2373,11 @@
   4.602      { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
   4.603  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
   4.604      sed 's/^/| /' "$ac_site_file" >&5
   4.605 -    . "$ac_site_file"
   4.606 +    . "$ac_site_file" \
   4.607 +      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   4.608 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.609 +as_fn_error $? "failed to load site script $ac_site_file
   4.610 +See \`config.log' for more details" "$LINENO" 5; }
   4.611    fi
   4.612  done
   4.613  
   4.614 @@ -2425,7 +2453,7 @@
   4.615  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.616    { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
   4.617  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   4.618 -  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
   4.619 +  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
   4.620  fi
   4.621  ## -------------------- ##
   4.622  ## Main body of script. ##
   4.623 @@ -2490,16 +2518,22 @@
   4.624  
   4.625  ac_aux_dir=
   4.626  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   4.627 -  for ac_t in install-sh install.sh shtool; do
   4.628 -    if test -f "$ac_dir/$ac_t"; then
   4.629 -      ac_aux_dir=$ac_dir
   4.630 -      ac_install_sh="$ac_aux_dir/$ac_t -c"
   4.631 -      break 2
   4.632 -    fi
   4.633 -  done
   4.634 +  if test -f "$ac_dir/install-sh"; then
   4.635 +    ac_aux_dir=$ac_dir
   4.636 +    ac_install_sh="$ac_aux_dir/install-sh -c"
   4.637 +    break
   4.638 +  elif test -f "$ac_dir/install.sh"; then
   4.639 +    ac_aux_dir=$ac_dir
   4.640 +    ac_install_sh="$ac_aux_dir/install.sh -c"
   4.641 +    break
   4.642 +  elif test -f "$ac_dir/shtool"; then
   4.643 +    ac_aux_dir=$ac_dir
   4.644 +    ac_install_sh="$ac_aux_dir/shtool install -c"
   4.645 +    break
   4.646 +  fi
   4.647  done
   4.648  if test -z "$ac_aux_dir"; then
   4.649 -  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
   4.650 +  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
   4.651  fi
   4.652  
   4.653  # These three variables are undocumented and unsupported,
   4.654 @@ -2513,27 +2547,27 @@
   4.655  
   4.656  # Make sure we can run config.sub.
   4.657  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   4.658 -  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
   4.659 +  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
   4.660  
   4.661  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
   4.662  $as_echo_n "checking build system type... " >&6; }
   4.663 -if test "${ac_cv_build+set}" = set; then :
   4.664 +if ${ac_cv_build+:} false; then :
   4.665    $as_echo_n "(cached) " >&6
   4.666  else
   4.667    ac_build_alias=$build_alias
   4.668  test "x$ac_build_alias" = x &&
   4.669    ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
   4.670  test "x$ac_build_alias" = x &&
   4.671 -  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
   4.672 +  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
   4.673  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
   4.674 -  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
   4.675 +  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
   4.676  
   4.677  fi
   4.678  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
   4.679  $as_echo "$ac_cv_build" >&6; }
   4.680  case $ac_cv_build in
   4.681  *-*-*) ;;
   4.682 -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
   4.683 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
   4.684  esac
   4.685  build=$ac_cv_build
   4.686  ac_save_IFS=$IFS; IFS='-'
   4.687 @@ -2551,14 +2585,14 @@
   4.688  
   4.689  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
   4.690  $as_echo_n "checking host system type... " >&6; }
   4.691 -if test "${ac_cv_host+set}" = set; then :
   4.692 +if ${ac_cv_host+:} false; then :
   4.693    $as_echo_n "(cached) " >&6
   4.694  else
   4.695    if test "x$host_alias" = x; then
   4.696    ac_cv_host=$ac_cv_build
   4.697  else
   4.698    ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
   4.699 -    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
   4.700 +    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
   4.701  fi
   4.702  
   4.703  fi
   4.704 @@ -2566,7 +2600,7 @@
   4.705  $as_echo "$ac_cv_host" >&6; }
   4.706  case $ac_cv_host in
   4.707  *-*-*) ;;
   4.708 -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
   4.709 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
   4.710  esac
   4.711  host=$ac_cv_host
   4.712  ac_save_IFS=$IFS; IFS='-'
   4.713 @@ -2595,7 +2629,7 @@
   4.714  set dummy ${ac_tool_prefix}gcc; ac_word=$2
   4.715  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.716  $as_echo_n "checking for $ac_word... " >&6; }
   4.717 -if test "${ac_cv_prog_CC+set}" = set; then :
   4.718 +if ${ac_cv_prog_CC+:} false; then :
   4.719    $as_echo_n "(cached) " >&6
   4.720  else
   4.721    if test -n "$CC"; then
   4.722 @@ -2607,7 +2641,7 @@
   4.723    IFS=$as_save_IFS
   4.724    test -z "$as_dir" && as_dir=.
   4.725      for ac_exec_ext in '' $ac_executable_extensions; do
   4.726 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   4.727 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.728      ac_cv_prog_CC="${ac_tool_prefix}gcc"
   4.729      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.730      break 2
   4.731 @@ -2635,7 +2669,7 @@
   4.732  set dummy gcc; ac_word=$2
   4.733  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.734  $as_echo_n "checking for $ac_word... " >&6; }
   4.735 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   4.736 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
   4.737    $as_echo_n "(cached) " >&6
   4.738  else
   4.739    if test -n "$ac_ct_CC"; then
   4.740 @@ -2647,7 +2681,7 @@
   4.741    IFS=$as_save_IFS
   4.742    test -z "$as_dir" && as_dir=.
   4.743      for ac_exec_ext in '' $ac_executable_extensions; do
   4.744 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   4.745 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.746      ac_cv_prog_ac_ct_CC="gcc"
   4.747      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.748      break 2
   4.749 @@ -2688,7 +2722,7 @@
   4.750  set dummy ${ac_tool_prefix}cc; ac_word=$2
   4.751  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.752  $as_echo_n "checking for $ac_word... " >&6; }
   4.753 -if test "${ac_cv_prog_CC+set}" = set; then :
   4.754 +if ${ac_cv_prog_CC+:} false; then :
   4.755    $as_echo_n "(cached) " >&6
   4.756  else
   4.757    if test -n "$CC"; then
   4.758 @@ -2700,7 +2734,7 @@
   4.759    IFS=$as_save_IFS
   4.760    test -z "$as_dir" && as_dir=.
   4.761      for ac_exec_ext in '' $ac_executable_extensions; do
   4.762 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   4.763 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.764      ac_cv_prog_CC="${ac_tool_prefix}cc"
   4.765      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.766      break 2
   4.767 @@ -2728,7 +2762,7 @@
   4.768  set dummy cc; ac_word=$2
   4.769  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.770  $as_echo_n "checking for $ac_word... " >&6; }
   4.771 -if test "${ac_cv_prog_CC+set}" = set; then :
   4.772 +if ${ac_cv_prog_CC+:} false; then :
   4.773    $as_echo_n "(cached) " >&6
   4.774  else
   4.775    if test -n "$CC"; then
   4.776 @@ -2741,7 +2775,7 @@
   4.777    IFS=$as_save_IFS
   4.778    test -z "$as_dir" && as_dir=.
   4.779      for ac_exec_ext in '' $ac_executable_extensions; do
   4.780 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   4.781 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.782      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
   4.783         ac_prog_rejected=yes
   4.784         continue
   4.785 @@ -2787,7 +2821,7 @@
   4.786  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   4.787  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.788  $as_echo_n "checking for $ac_word... " >&6; }
   4.789 -if test "${ac_cv_prog_CC+set}" = set; then :
   4.790 +if ${ac_cv_prog_CC+:} false; then :
   4.791    $as_echo_n "(cached) " >&6
   4.792  else
   4.793    if test -n "$CC"; then
   4.794 @@ -2799,7 +2833,7 @@
   4.795    IFS=$as_save_IFS
   4.796    test -z "$as_dir" && as_dir=.
   4.797      for ac_exec_ext in '' $ac_executable_extensions; do
   4.798 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   4.799 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.800      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
   4.801      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.802      break 2
   4.803 @@ -2831,7 +2865,7 @@
   4.804  set dummy $ac_prog; ac_word=$2
   4.805  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.806  $as_echo_n "checking for $ac_word... " >&6; }
   4.807 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   4.808 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
   4.809    $as_echo_n "(cached) " >&6
   4.810  else
   4.811    if test -n "$ac_ct_CC"; then
   4.812 @@ -2843,7 +2877,7 @@
   4.813    IFS=$as_save_IFS
   4.814    test -z "$as_dir" && as_dir=.
   4.815      for ac_exec_ext in '' $ac_executable_extensions; do
   4.816 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   4.817 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.818      ac_cv_prog_ac_ct_CC="$ac_prog"
   4.819      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.820      break 2
   4.821 @@ -2885,8 +2919,8 @@
   4.822  
   4.823  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   4.824  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.825 -as_fn_error "no acceptable C compiler found in \$PATH
   4.826 -See \`config.log' for more details." "$LINENO" 5; }
   4.827 +as_fn_error $? "no acceptable C compiler found in \$PATH
   4.828 +See \`config.log' for more details" "$LINENO" 5; }
   4.829  
   4.830  # Provide some information about the compiler.
   4.831  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
   4.832 @@ -3000,9 +3034,8 @@
   4.833  
   4.834  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   4.835  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.836 -{ as_fn_set_status 77
   4.837 -as_fn_error "C compiler cannot create executables
   4.838 -See \`config.log' for more details." "$LINENO" 5; }; }
   4.839 +as_fn_error 77 "C compiler cannot create executables
   4.840 +See \`config.log' for more details" "$LINENO" 5; }
   4.841  else
   4.842    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   4.843  $as_echo "yes" >&6; }
   4.844 @@ -3044,8 +3077,8 @@
   4.845  else
   4.846    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   4.847  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.848 -as_fn_error "cannot compute suffix of executables: cannot compile and link
   4.849 -See \`config.log' for more details." "$LINENO" 5; }
   4.850 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
   4.851 +See \`config.log' for more details" "$LINENO" 5; }
   4.852  fi
   4.853  rm -f conftest conftest$ac_cv_exeext
   4.854  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
   4.855 @@ -3102,9 +3135,9 @@
   4.856      else
   4.857  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   4.858  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.859 -as_fn_error "cannot run C compiled programs.
   4.860 +as_fn_error $? "cannot run C compiled programs.
   4.861  If you meant to cross compile, use \`--host'.
   4.862 -See \`config.log' for more details." "$LINENO" 5; }
   4.863 +See \`config.log' for more details" "$LINENO" 5; }
   4.864      fi
   4.865    fi
   4.866  fi
   4.867 @@ -3115,7 +3148,7 @@
   4.868  ac_clean_files=$ac_clean_files_save
   4.869  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
   4.870  $as_echo_n "checking for suffix of object files... " >&6; }
   4.871 -if test "${ac_cv_objext+set}" = set; then :
   4.872 +if ${ac_cv_objext+:} false; then :
   4.873    $as_echo_n "(cached) " >&6
   4.874  else
   4.875    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   4.876 @@ -3155,8 +3188,8 @@
   4.877  
   4.878  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   4.879  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   4.880 -as_fn_error "cannot compute suffix of object files: cannot compile
   4.881 -See \`config.log' for more details." "$LINENO" 5; }
   4.882 +as_fn_error $? "cannot compute suffix of object files: cannot compile
   4.883 +See \`config.log' for more details" "$LINENO" 5; }
   4.884  fi
   4.885  rm -f conftest.$ac_cv_objext conftest.$ac_ext
   4.886  fi
   4.887 @@ -3166,7 +3199,7 @@
   4.888  ac_objext=$OBJEXT
   4.889  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
   4.890  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
   4.891 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   4.892 +if ${ac_cv_c_compiler_gnu+:} false; then :
   4.893    $as_echo_n "(cached) " >&6
   4.894  else
   4.895    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   4.896 @@ -3203,7 +3236,7 @@
   4.897  ac_save_CFLAGS=$CFLAGS
   4.898  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
   4.899  $as_echo_n "checking whether $CC accepts -g... " >&6; }
   4.900 -if test "${ac_cv_prog_cc_g+set}" = set; then :
   4.901 +if ${ac_cv_prog_cc_g+:} false; then :
   4.902    $as_echo_n "(cached) " >&6
   4.903  else
   4.904    ac_save_c_werror_flag=$ac_c_werror_flag
   4.905 @@ -3281,7 +3314,7 @@
   4.906  fi
   4.907  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
   4.908  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
   4.909 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
   4.910 +if ${ac_cv_prog_cc_c89+:} false; then :
   4.911    $as_echo_n "(cached) " >&6
   4.912  else
   4.913    ac_cv_prog_cc_c89=no
   4.914 @@ -3290,8 +3323,7 @@
   4.915  /* end confdefs.h.  */
   4.916  #include <stdarg.h>
   4.917  #include <stdio.h>
   4.918 -#include <sys/types.h>
   4.919 -#include <sys/stat.h>
   4.920 +struct stat;
   4.921  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
   4.922  struct buf { int x; };
   4.923  FILE * (*rcsopen) (struct buf *, struct stat *, int);
   4.924 @@ -3383,7 +3415,7 @@
   4.925  ac_compiler_gnu=$ac_cv_c_compiler_gnu
   4.926  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
   4.927  $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
   4.928 -if test "${am_cv_prog_cc_c_o+set}" = set; then :
   4.929 +if ${am_cv_prog_cc_c_o+:} false; then :
   4.930    $as_echo_n "(cached) " >&6
   4.931  else
   4.932    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   4.933 @@ -3437,7 +3469,7 @@
   4.934  
   4.935  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
   4.936  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
   4.937 -if test "${ac_cv_path_SED+set}" = set; then :
   4.938 +if ${ac_cv_path_SED+:} false; then :
   4.939    $as_echo_n "(cached) " >&6
   4.940  else
   4.941              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
   4.942 @@ -3457,7 +3489,7 @@
   4.943      for ac_prog in sed gsed; do
   4.944      for ac_exec_ext in '' $ac_executable_extensions; do
   4.945        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
   4.946 -      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
   4.947 +      as_fn_executable_p "$ac_path_SED" || continue
   4.948  # Check for GNU ac_path_SED and select it if it is found.
   4.949    # Check for GNU $ac_path_SED
   4.950  case `"$ac_path_SED" --version 2>&1` in
   4.951 @@ -3492,7 +3524,7 @@
   4.952    done
   4.953  IFS=$as_save_IFS
   4.954    if test -z "$ac_cv_path_SED"; then
   4.955 -    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   4.956 +    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   4.957    fi
   4.958  else
   4.959    ac_cv_path_SED=$SED
   4.960 @@ -3519,7 +3551,7 @@
   4.961  
   4.962  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
   4.963  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
   4.964 -if test "${ac_cv_path_GREP+set}" = set; then :
   4.965 +if ${ac_cv_path_GREP+:} false; then :
   4.966    $as_echo_n "(cached) " >&6
   4.967  else
   4.968    if test -z "$GREP"; then
   4.969 @@ -3533,7 +3565,7 @@
   4.970      for ac_prog in grep ggrep; do
   4.971      for ac_exec_ext in '' $ac_executable_extensions; do
   4.972        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
   4.973 -      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
   4.974 +      as_fn_executable_p "$ac_path_GREP" || continue
   4.975  # Check for GNU ac_path_GREP and select it if it is found.
   4.976    # Check for GNU $ac_path_GREP
   4.977  case `"$ac_path_GREP" --version 2>&1` in
   4.978 @@ -3568,7 +3600,7 @@
   4.979    done
   4.980  IFS=$as_save_IFS
   4.981    if test -z "$ac_cv_path_GREP"; then
   4.982 -    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   4.983 +    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   4.984    fi
   4.985  else
   4.986    ac_cv_path_GREP=$GREP
   4.987 @@ -3582,7 +3614,7 @@
   4.988  
   4.989  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
   4.990  $as_echo_n "checking for egrep... " >&6; }
   4.991 -if test "${ac_cv_path_EGREP+set}" = set; then :
   4.992 +if ${ac_cv_path_EGREP+:} false; then :
   4.993    $as_echo_n "(cached) " >&6
   4.994  else
   4.995    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   4.996 @@ -3599,7 +3631,7 @@
   4.997      for ac_prog in egrep; do
   4.998      for ac_exec_ext in '' $ac_executable_extensions; do
   4.999        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  4.1000 -      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  4.1001 +      as_fn_executable_p "$ac_path_EGREP" || continue
  4.1002  # Check for GNU ac_path_EGREP and select it if it is found.
  4.1003    # Check for GNU $ac_path_EGREP
  4.1004  case `"$ac_path_EGREP" --version 2>&1` in
  4.1005 @@ -3634,7 +3666,7 @@
  4.1006    done
  4.1007  IFS=$as_save_IFS
  4.1008    if test -z "$ac_cv_path_EGREP"; then
  4.1009 -    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.1010 +    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.1011    fi
  4.1012  else
  4.1013    ac_cv_path_EGREP=$EGREP
  4.1014 @@ -3649,7 +3681,7 @@
  4.1015  
  4.1016  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  4.1017  $as_echo_n "checking for fgrep... " >&6; }
  4.1018 -if test "${ac_cv_path_FGREP+set}" = set; then :
  4.1019 +if ${ac_cv_path_FGREP+:} false; then :
  4.1020    $as_echo_n "(cached) " >&6
  4.1021  else
  4.1022    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
  4.1023 @@ -3666,7 +3698,7 @@
  4.1024      for ac_prog in fgrep; do
  4.1025      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1026        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
  4.1027 -      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
  4.1028 +      as_fn_executable_p "$ac_path_FGREP" || continue
  4.1029  # Check for GNU ac_path_FGREP and select it if it is found.
  4.1030    # Check for GNU $ac_path_FGREP
  4.1031  case `"$ac_path_FGREP" --version 2>&1` in
  4.1032 @@ -3701,7 +3733,7 @@
  4.1033    done
  4.1034  IFS=$as_save_IFS
  4.1035    if test -z "$ac_cv_path_FGREP"; then
  4.1036 -    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.1037 +    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.1038    fi
  4.1039  else
  4.1040    ac_cv_path_FGREP=$FGREP
  4.1041 @@ -3780,7 +3812,7 @@
  4.1042    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
  4.1043  $as_echo_n "checking for non-GNU ld... " >&6; }
  4.1044  fi
  4.1045 -if test "${lt_cv_path_LD+set}" = set; then :
  4.1046 +if ${lt_cv_path_LD+:} false; then :
  4.1047    $as_echo_n "(cached) " >&6
  4.1048  else
  4.1049    if test -z "$LD"; then
  4.1050 @@ -3817,10 +3849,10 @@
  4.1051    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1052  $as_echo "no" >&6; }
  4.1053  fi
  4.1054 -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
  4.1055 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
  4.1056  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
  4.1057  $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
  4.1058 -if test "${lt_cv_prog_gnu_ld+set}" = set; then :
  4.1059 +if ${lt_cv_prog_gnu_ld+:} false; then :
  4.1060    $as_echo_n "(cached) " >&6
  4.1061  else
  4.1062    # I'd rather use --version here, but apparently some GNU lds only accept -v.
  4.1063 @@ -3847,7 +3879,7 @@
  4.1064  
  4.1065  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
  4.1066  $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
  4.1067 -if test "${lt_cv_path_NM+set}" = set; then :
  4.1068 +if ${lt_cv_path_NM+:} false; then :
  4.1069    $as_echo_n "(cached) " >&6
  4.1070  else
  4.1071    if test -n "$NM"; then
  4.1072 @@ -3907,7 +3939,7 @@
  4.1073  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  4.1074  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1075  $as_echo_n "checking for $ac_word... " >&6; }
  4.1076 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
  4.1077 +if ${ac_cv_prog_DUMPBIN+:} false; then :
  4.1078    $as_echo_n "(cached) " >&6
  4.1079  else
  4.1080    if test -n "$DUMPBIN"; then
  4.1081 @@ -3919,7 +3951,7 @@
  4.1082    IFS=$as_save_IFS
  4.1083    test -z "$as_dir" && as_dir=.
  4.1084      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1085 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1086 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1087      ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
  4.1088      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1089      break 2
  4.1090 @@ -3951,7 +3983,7 @@
  4.1091  set dummy $ac_prog; ac_word=$2
  4.1092  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1093  $as_echo_n "checking for $ac_word... " >&6; }
  4.1094 -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
  4.1095 +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
  4.1096    $as_echo_n "(cached) " >&6
  4.1097  else
  4.1098    if test -n "$ac_ct_DUMPBIN"; then
  4.1099 @@ -3963,7 +3995,7 @@
  4.1100    IFS=$as_save_IFS
  4.1101    test -z "$as_dir" && as_dir=.
  4.1102      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1103 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1104 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1105      ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
  4.1106      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1107      break 2
  4.1108 @@ -4014,18 +4046,18 @@
  4.1109  
  4.1110  { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
  4.1111  $as_echo_n "checking the name lister ($NM) interface... " >&6; }
  4.1112 -if test "${lt_cv_nm_interface+set}" = set; then :
  4.1113 +if ${lt_cv_nm_interface+:} false; then :
  4.1114    $as_echo_n "(cached) " >&6
  4.1115  else
  4.1116    lt_cv_nm_interface="BSD nm"
  4.1117    echo "int some_variable = 0;" > conftest.$ac_ext
  4.1118 -  (eval echo "\"\$as_me:4022: $ac_compile\"" >&5)
  4.1119 +  (eval echo "\"\$as_me:4054: $ac_compile\"" >&5)
  4.1120    (eval "$ac_compile" 2>conftest.err)
  4.1121    cat conftest.err >&5
  4.1122 -  (eval echo "\"\$as_me:4025: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  4.1123 +  (eval echo "\"\$as_me:4057: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  4.1124    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  4.1125    cat conftest.err >&5
  4.1126 -  (eval echo "\"\$as_me:4028: output\"" >&5)
  4.1127 +  (eval echo "\"\$as_me:4060: output\"" >&5)
  4.1128    cat conftest.out >&5
  4.1129    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
  4.1130      lt_cv_nm_interface="MS dumpbin"
  4.1131 @@ -4049,7 +4081,7 @@
  4.1132  # find the maximum length of command line arguments
  4.1133  { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
  4.1134  $as_echo_n "checking the maximum length of command line arguments... " >&6; }
  4.1135 -if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
  4.1136 +if ${lt_cv_sys_max_cmd_len+:} false; then :
  4.1137    $as_echo_n "(cached) " >&6
  4.1138  else
  4.1139      i=0
  4.1140 @@ -4247,7 +4279,7 @@
  4.1141  
  4.1142  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  4.1143  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  4.1144 -if test "${lt_cv_ld_reload_flag+set}" = set; then :
  4.1145 +if ${lt_cv_ld_reload_flag+:} false; then :
  4.1146    $as_echo_n "(cached) " >&6
  4.1147  else
  4.1148    lt_cv_ld_reload_flag='-r'
  4.1149 @@ -4283,7 +4315,7 @@
  4.1150  set dummy ${ac_tool_prefix}objdump; ac_word=$2
  4.1151  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1152  $as_echo_n "checking for $ac_word... " >&6; }
  4.1153 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  4.1154 +if ${ac_cv_prog_OBJDUMP+:} false; then :
  4.1155    $as_echo_n "(cached) " >&6
  4.1156  else
  4.1157    if test -n "$OBJDUMP"; then
  4.1158 @@ -4295,7 +4327,7 @@
  4.1159    IFS=$as_save_IFS
  4.1160    test -z "$as_dir" && as_dir=.
  4.1161      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1162 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1163 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1164      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  4.1165      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1166      break 2
  4.1167 @@ -4323,7 +4355,7 @@
  4.1168  set dummy objdump; ac_word=$2
  4.1169  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1170  $as_echo_n "checking for $ac_word... " >&6; }
  4.1171 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  4.1172 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  4.1173    $as_echo_n "(cached) " >&6
  4.1174  else
  4.1175    if test -n "$ac_ct_OBJDUMP"; then
  4.1176 @@ -4335,7 +4367,7 @@
  4.1177    IFS=$as_save_IFS
  4.1178    test -z "$as_dir" && as_dir=.
  4.1179      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1180 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1181 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1182      ac_cv_prog_ac_ct_OBJDUMP="objdump"
  4.1183      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1184      break 2
  4.1185 @@ -4379,7 +4411,7 @@
  4.1186  
  4.1187  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
  4.1188  $as_echo_n "checking how to recognize dependent libraries... " >&6; }
  4.1189 -if test "${lt_cv_deplibs_check_method+set}" = set; then :
  4.1190 +if ${lt_cv_deplibs_check_method+:} false; then :
  4.1191    $as_echo_n "(cached) " >&6
  4.1192  else
  4.1193    lt_cv_file_magic_cmd='$MAGIC_CMD'
  4.1194 @@ -4597,7 +4629,7 @@
  4.1195  set dummy ${ac_tool_prefix}ar; ac_word=$2
  4.1196  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1197  $as_echo_n "checking for $ac_word... " >&6; }
  4.1198 -if test "${ac_cv_prog_AR+set}" = set; then :
  4.1199 +if ${ac_cv_prog_AR+:} false; then :
  4.1200    $as_echo_n "(cached) " >&6
  4.1201  else
  4.1202    if test -n "$AR"; then
  4.1203 @@ -4609,7 +4641,7 @@
  4.1204    IFS=$as_save_IFS
  4.1205    test -z "$as_dir" && as_dir=.
  4.1206      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1207 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1208 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1209      ac_cv_prog_AR="${ac_tool_prefix}ar"
  4.1210      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1211      break 2
  4.1212 @@ -4637,7 +4669,7 @@
  4.1213  set dummy ar; ac_word=$2
  4.1214  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1215  $as_echo_n "checking for $ac_word... " >&6; }
  4.1216 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
  4.1217 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
  4.1218    $as_echo_n "(cached) " >&6
  4.1219  else
  4.1220    if test -n "$ac_ct_AR"; then
  4.1221 @@ -4649,7 +4681,7 @@
  4.1222    IFS=$as_save_IFS
  4.1223    test -z "$as_dir" && as_dir=.
  4.1224      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1225 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1226 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1227      ac_cv_prog_ac_ct_AR="ar"
  4.1228      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1229      break 2
  4.1230 @@ -4702,7 +4734,7 @@
  4.1231  set dummy ${ac_tool_prefix}strip; ac_word=$2
  4.1232  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1233  $as_echo_n "checking for $ac_word... " >&6; }
  4.1234 -if test "${ac_cv_prog_STRIP+set}" = set; then :
  4.1235 +if ${ac_cv_prog_STRIP+:} false; then :
  4.1236    $as_echo_n "(cached) " >&6
  4.1237  else
  4.1238    if test -n "$STRIP"; then
  4.1239 @@ -4714,7 +4746,7 @@
  4.1240    IFS=$as_save_IFS
  4.1241    test -z "$as_dir" && as_dir=.
  4.1242      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1243 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1244 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1245      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  4.1246      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1247      break 2
  4.1248 @@ -4742,7 +4774,7 @@
  4.1249  set dummy strip; ac_word=$2
  4.1250  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1251  $as_echo_n "checking for $ac_word... " >&6; }
  4.1252 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  4.1253 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  4.1254    $as_echo_n "(cached) " >&6
  4.1255  else
  4.1256    if test -n "$ac_ct_STRIP"; then
  4.1257 @@ -4754,7 +4786,7 @@
  4.1258    IFS=$as_save_IFS
  4.1259    test -z "$as_dir" && as_dir=.
  4.1260      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1261 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1262 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1263      ac_cv_prog_ac_ct_STRIP="strip"
  4.1264      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1265      break 2
  4.1266 @@ -4801,7 +4833,7 @@
  4.1267  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  4.1268  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1269  $as_echo_n "checking for $ac_word... " >&6; }
  4.1270 -if test "${ac_cv_prog_RANLIB+set}" = set; then :
  4.1271 +if ${ac_cv_prog_RANLIB+:} false; then :
  4.1272    $as_echo_n "(cached) " >&6
  4.1273  else
  4.1274    if test -n "$RANLIB"; then
  4.1275 @@ -4813,7 +4845,7 @@
  4.1276    IFS=$as_save_IFS
  4.1277    test -z "$as_dir" && as_dir=.
  4.1278      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1279 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1280 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1281      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
  4.1282      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1283      break 2
  4.1284 @@ -4841,7 +4873,7 @@
  4.1285  set dummy ranlib; ac_word=$2
  4.1286  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1287  $as_echo_n "checking for $ac_word... " >&6; }
  4.1288 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
  4.1289 +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
  4.1290    $as_echo_n "(cached) " >&6
  4.1291  else
  4.1292    if test -n "$ac_ct_RANLIB"; then
  4.1293 @@ -4853,7 +4885,7 @@
  4.1294    IFS=$as_save_IFS
  4.1295    test -z "$as_dir" && as_dir=.
  4.1296      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1297 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1298 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1299      ac_cv_prog_ac_ct_RANLIB="ranlib"
  4.1300      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1301      break 2
  4.1302 @@ -4958,7 +4990,7 @@
  4.1303  # Check for command to grab the raw symbol name followed by C symbol from nm.
  4.1304  { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
  4.1305  $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
  4.1306 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
  4.1307 +if ${lt_cv_sys_global_symbol_pipe+:} false; then :
  4.1308    $as_echo_n "(cached) " >&6
  4.1309  else
  4.1310  
  4.1311 @@ -5236,7 +5268,7 @@
  4.1312    ;;
  4.1313  *-*-irix6*)
  4.1314    # Find out which ABI we are using.
  4.1315 -  echo '#line 5239 "configure"' > conftest.$ac_ext
  4.1316 +  echo '#line 5271 "configure"' > conftest.$ac_ext
  4.1317    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  4.1318    (eval $ac_compile) 2>&5
  4.1319    ac_status=$?
  4.1320 @@ -5333,7 +5365,7 @@
  4.1321    CFLAGS="$CFLAGS -belf"
  4.1322    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
  4.1323  $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
  4.1324 -if test "${lt_cv_cc_needs_belf+set}" = set; then :
  4.1325 +if ${lt_cv_cc_needs_belf+:} false; then :
  4.1326    $as_echo_n "(cached) " >&6
  4.1327  else
  4.1328    ac_ext=c
  4.1329 @@ -5409,7 +5441,7 @@
  4.1330  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
  4.1331  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1332  $as_echo_n "checking for $ac_word... " >&6; }
  4.1333 -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
  4.1334 +if ${ac_cv_prog_DSYMUTIL+:} false; then :
  4.1335    $as_echo_n "(cached) " >&6
  4.1336  else
  4.1337    if test -n "$DSYMUTIL"; then
  4.1338 @@ -5421,7 +5453,7 @@
  4.1339    IFS=$as_save_IFS
  4.1340    test -z "$as_dir" && as_dir=.
  4.1341      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1342 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1343 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1344      ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
  4.1345      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1346      break 2
  4.1347 @@ -5449,7 +5481,7 @@
  4.1348  set dummy dsymutil; ac_word=$2
  4.1349  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1350  $as_echo_n "checking for $ac_word... " >&6; }
  4.1351 -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
  4.1352 +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
  4.1353    $as_echo_n "(cached) " >&6
  4.1354  else
  4.1355    if test -n "$ac_ct_DSYMUTIL"; then
  4.1356 @@ -5461,7 +5493,7 @@
  4.1357    IFS=$as_save_IFS
  4.1358    test -z "$as_dir" && as_dir=.
  4.1359      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1360 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1361 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1362      ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
  4.1363      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1364      break 2
  4.1365 @@ -5501,7 +5533,7 @@
  4.1366  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
  4.1367  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1368  $as_echo_n "checking for $ac_word... " >&6; }
  4.1369 -if test "${ac_cv_prog_NMEDIT+set}" = set; then :
  4.1370 +if ${ac_cv_prog_NMEDIT+:} false; then :
  4.1371    $as_echo_n "(cached) " >&6
  4.1372  else
  4.1373    if test -n "$NMEDIT"; then
  4.1374 @@ -5513,7 +5545,7 @@
  4.1375    IFS=$as_save_IFS
  4.1376    test -z "$as_dir" && as_dir=.
  4.1377      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1378 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1379 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1380      ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
  4.1381      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1382      break 2
  4.1383 @@ -5541,7 +5573,7 @@
  4.1384  set dummy nmedit; ac_word=$2
  4.1385  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1386  $as_echo_n "checking for $ac_word... " >&6; }
  4.1387 -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
  4.1388 +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
  4.1389    $as_echo_n "(cached) " >&6
  4.1390  else
  4.1391    if test -n "$ac_ct_NMEDIT"; then
  4.1392 @@ -5553,7 +5585,7 @@
  4.1393    IFS=$as_save_IFS
  4.1394    test -z "$as_dir" && as_dir=.
  4.1395      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1396 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1397 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1398      ac_cv_prog_ac_ct_NMEDIT="nmedit"
  4.1399      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1400      break 2
  4.1401 @@ -5593,7 +5625,7 @@
  4.1402  set dummy ${ac_tool_prefix}lipo; ac_word=$2
  4.1403  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1404  $as_echo_n "checking for $ac_word... " >&6; }
  4.1405 -if test "${ac_cv_prog_LIPO+set}" = set; then :
  4.1406 +if ${ac_cv_prog_LIPO+:} false; then :
  4.1407    $as_echo_n "(cached) " >&6
  4.1408  else
  4.1409    if test -n "$LIPO"; then
  4.1410 @@ -5605,7 +5637,7 @@
  4.1411    IFS=$as_save_IFS
  4.1412    test -z "$as_dir" && as_dir=.
  4.1413      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1414 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1415 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1416      ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
  4.1417      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1418      break 2
  4.1419 @@ -5633,7 +5665,7 @@
  4.1420  set dummy lipo; ac_word=$2
  4.1421  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1422  $as_echo_n "checking for $ac_word... " >&6; }
  4.1423 -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
  4.1424 +if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
  4.1425    $as_echo_n "(cached) " >&6
  4.1426  else
  4.1427    if test -n "$ac_ct_LIPO"; then
  4.1428 @@ -5645,7 +5677,7 @@
  4.1429    IFS=$as_save_IFS
  4.1430    test -z "$as_dir" && as_dir=.
  4.1431      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1432 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1433 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1434      ac_cv_prog_ac_ct_LIPO="lipo"
  4.1435      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1436      break 2
  4.1437 @@ -5685,7 +5717,7 @@
  4.1438  set dummy ${ac_tool_prefix}otool; ac_word=$2
  4.1439  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1440  $as_echo_n "checking for $ac_word... " >&6; }
  4.1441 -if test "${ac_cv_prog_OTOOL+set}" = set; then :
  4.1442 +if ${ac_cv_prog_OTOOL+:} false; then :
  4.1443    $as_echo_n "(cached) " >&6
  4.1444  else
  4.1445    if test -n "$OTOOL"; then
  4.1446 @@ -5697,7 +5729,7 @@
  4.1447    IFS=$as_save_IFS
  4.1448    test -z "$as_dir" && as_dir=.
  4.1449      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1450 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1451 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1452      ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
  4.1453      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1454      break 2
  4.1455 @@ -5725,7 +5757,7 @@
  4.1456  set dummy otool; ac_word=$2
  4.1457  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1458  $as_echo_n "checking for $ac_word... " >&6; }
  4.1459 -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
  4.1460 +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
  4.1461    $as_echo_n "(cached) " >&6
  4.1462  else
  4.1463    if test -n "$ac_ct_OTOOL"; then
  4.1464 @@ -5737,7 +5769,7 @@
  4.1465    IFS=$as_save_IFS
  4.1466    test -z "$as_dir" && as_dir=.
  4.1467      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1468 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1469 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1470      ac_cv_prog_ac_ct_OTOOL="otool"
  4.1471      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1472      break 2
  4.1473 @@ -5777,7 +5809,7 @@
  4.1474  set dummy ${ac_tool_prefix}otool64; ac_word=$2
  4.1475  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1476  $as_echo_n "checking for $ac_word... " >&6; }
  4.1477 -if test "${ac_cv_prog_OTOOL64+set}" = set; then :
  4.1478 +if ${ac_cv_prog_OTOOL64+:} false; then :
  4.1479    $as_echo_n "(cached) " >&6
  4.1480  else
  4.1481    if test -n "$OTOOL64"; then
  4.1482 @@ -5789,7 +5821,7 @@
  4.1483    IFS=$as_save_IFS
  4.1484    test -z "$as_dir" && as_dir=.
  4.1485      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1486 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1487 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1488      ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
  4.1489      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1490      break 2
  4.1491 @@ -5817,7 +5849,7 @@
  4.1492  set dummy otool64; ac_word=$2
  4.1493  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1494  $as_echo_n "checking for $ac_word... " >&6; }
  4.1495 -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
  4.1496 +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
  4.1497    $as_echo_n "(cached) " >&6
  4.1498  else
  4.1499    if test -n "$ac_ct_OTOOL64"; then
  4.1500 @@ -5829,7 +5861,7 @@
  4.1501    IFS=$as_save_IFS
  4.1502    test -z "$as_dir" && as_dir=.
  4.1503      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1504 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1505 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1506      ac_cv_prog_ac_ct_OTOOL64="otool64"
  4.1507      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1508      break 2
  4.1509 @@ -5892,7 +5924,7 @@
  4.1510  
  4.1511      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
  4.1512  $as_echo_n "checking for -single_module linker flag... " >&6; }
  4.1513 -if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
  4.1514 +if ${lt_cv_apple_cc_single_mod+:} false; then :
  4.1515    $as_echo_n "(cached) " >&6
  4.1516  else
  4.1517    lt_cv_apple_cc_single_mod=no
  4.1518 @@ -5921,7 +5953,7 @@
  4.1519  $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
  4.1520      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
  4.1521  $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
  4.1522 -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
  4.1523 +if ${lt_cv_ld_exported_symbols_list+:} false; then :
  4.1524    $as_echo_n "(cached) " >&6
  4.1525  else
  4.1526    lt_cv_ld_exported_symbols_list=no
  4.1527 @@ -5998,7 +6030,7 @@
  4.1528    CPP=
  4.1529  fi
  4.1530  if test -z "$CPP"; then
  4.1531 -  if test "${ac_cv_prog_CPP+set}" = set; then :
  4.1532 +  if ${ac_cv_prog_CPP+:} false; then :
  4.1533    $as_echo_n "(cached) " >&6
  4.1534  else
  4.1535        # Double quotes because CPP needs to be expanded
  4.1536 @@ -6028,7 +6060,7 @@
  4.1537    # Broken: fails on valid input.
  4.1538  continue
  4.1539  fi
  4.1540 -rm -f conftest.err conftest.$ac_ext
  4.1541 +rm -f conftest.err conftest.i conftest.$ac_ext
  4.1542  
  4.1543    # OK, works on sane cases.  Now check whether nonexistent headers
  4.1544    # can be detected and how.
  4.1545 @@ -6044,11 +6076,11 @@
  4.1546  ac_preproc_ok=:
  4.1547  break
  4.1548  fi
  4.1549 -rm -f conftest.err conftest.$ac_ext
  4.1550 +rm -f conftest.err conftest.i conftest.$ac_ext
  4.1551  
  4.1552  done
  4.1553  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  4.1554 -rm -f conftest.err conftest.$ac_ext
  4.1555 +rm -f conftest.i conftest.err conftest.$ac_ext
  4.1556  if $ac_preproc_ok; then :
  4.1557    break
  4.1558  fi
  4.1559 @@ -6087,7 +6119,7 @@
  4.1560    # Broken: fails on valid input.
  4.1561  continue
  4.1562  fi
  4.1563 -rm -f conftest.err conftest.$ac_ext
  4.1564 +rm -f conftest.err conftest.i conftest.$ac_ext
  4.1565  
  4.1566    # OK, works on sane cases.  Now check whether nonexistent headers
  4.1567    # can be detected and how.
  4.1568 @@ -6103,18 +6135,18 @@
  4.1569  ac_preproc_ok=:
  4.1570  break
  4.1571  fi
  4.1572 -rm -f conftest.err conftest.$ac_ext
  4.1573 +rm -f conftest.err conftest.i conftest.$ac_ext
  4.1574  
  4.1575  done
  4.1576  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  4.1577 -rm -f conftest.err conftest.$ac_ext
  4.1578 +rm -f conftest.i conftest.err conftest.$ac_ext
  4.1579  if $ac_preproc_ok; then :
  4.1580  
  4.1581  else
  4.1582    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  4.1583  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  4.1584 -as_fn_error "C preprocessor \"$CPP\" fails sanity check
  4.1585 -See \`config.log' for more details." "$LINENO" 5; }
  4.1586 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  4.1587 +See \`config.log' for more details" "$LINENO" 5; }
  4.1588  fi
  4.1589  
  4.1590  ac_ext=c
  4.1591 @@ -6126,7 +6158,7 @@
  4.1592  
  4.1593  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  4.1594  $as_echo_n "checking for ANSI C header files... " >&6; }
  4.1595 -if test "${ac_cv_header_stdc+set}" = set; then :
  4.1596 +if ${ac_cv_header_stdc+:} false; then :
  4.1597    $as_echo_n "(cached) " >&6
  4.1598  else
  4.1599    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4.1600 @@ -6243,8 +6275,7 @@
  4.1601    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  4.1602  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
  4.1603  "
  4.1604 -eval as_val=\$$as_ac_Header
  4.1605 -   if test "x$as_val" = x""yes; then :
  4.1606 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
  4.1607    cat >>confdefs.h <<_ACEOF
  4.1608  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  4.1609  _ACEOF
  4.1610 @@ -6258,7 +6289,7 @@
  4.1611  do :
  4.1612    ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
  4.1613  "
  4.1614 -if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
  4.1615 +if test "x$ac_cv_header_dlfcn_h" = xyes; then :
  4.1616    cat >>confdefs.h <<_ACEOF
  4.1617  #define HAVE_DLFCN_H 1
  4.1618  _ACEOF
  4.1619 @@ -6279,7 +6310,7 @@
  4.1620  set dummy ${ac_tool_prefix}as; ac_word=$2
  4.1621  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1622  $as_echo_n "checking for $ac_word... " >&6; }
  4.1623 -if test "${ac_cv_prog_AS+set}" = set; then :
  4.1624 +if ${ac_cv_prog_AS+:} false; then :
  4.1625    $as_echo_n "(cached) " >&6
  4.1626  else
  4.1627    if test -n "$AS"; then
  4.1628 @@ -6291,7 +6322,7 @@
  4.1629    IFS=$as_save_IFS
  4.1630    test -z "$as_dir" && as_dir=.
  4.1631      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1632 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1633 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1634      ac_cv_prog_AS="${ac_tool_prefix}as"
  4.1635      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1636      break 2
  4.1637 @@ -6319,7 +6350,7 @@
  4.1638  set dummy as; ac_word=$2
  4.1639  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1640  $as_echo_n "checking for $ac_word... " >&6; }
  4.1641 -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
  4.1642 +if ${ac_cv_prog_ac_ct_AS+:} false; then :
  4.1643    $as_echo_n "(cached) " >&6
  4.1644  else
  4.1645    if test -n "$ac_ct_AS"; then
  4.1646 @@ -6331,7 +6362,7 @@
  4.1647    IFS=$as_save_IFS
  4.1648    test -z "$as_dir" && as_dir=.
  4.1649      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1650 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1651 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1652      ac_cv_prog_ac_ct_AS="as"
  4.1653      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1654      break 2
  4.1655 @@ -6371,7 +6402,7 @@
  4.1656  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  4.1657  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1658  $as_echo_n "checking for $ac_word... " >&6; }
  4.1659 -if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
  4.1660 +if ${ac_cv_prog_DLLTOOL+:} false; then :
  4.1661    $as_echo_n "(cached) " >&6
  4.1662  else
  4.1663    if test -n "$DLLTOOL"; then
  4.1664 @@ -6383,7 +6414,7 @@
  4.1665    IFS=$as_save_IFS
  4.1666    test -z "$as_dir" && as_dir=.
  4.1667      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1668 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1669 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1670      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  4.1671      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1672      break 2
  4.1673 @@ -6411,7 +6442,7 @@
  4.1674  set dummy dlltool; ac_word=$2
  4.1675  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1676  $as_echo_n "checking for $ac_word... " >&6; }
  4.1677 -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
  4.1678 +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  4.1679    $as_echo_n "(cached) " >&6
  4.1680  else
  4.1681    if test -n "$ac_ct_DLLTOOL"; then
  4.1682 @@ -6423,7 +6454,7 @@
  4.1683    IFS=$as_save_IFS
  4.1684    test -z "$as_dir" && as_dir=.
  4.1685      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1686 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1687 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1688      ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  4.1689      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1690      break 2
  4.1691 @@ -6463,7 +6494,7 @@
  4.1692  set dummy ${ac_tool_prefix}objdump; ac_word=$2
  4.1693  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1694  $as_echo_n "checking for $ac_word... " >&6; }
  4.1695 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  4.1696 +if ${ac_cv_prog_OBJDUMP+:} false; then :
  4.1697    $as_echo_n "(cached) " >&6
  4.1698  else
  4.1699    if test -n "$OBJDUMP"; then
  4.1700 @@ -6475,7 +6506,7 @@
  4.1701    IFS=$as_save_IFS
  4.1702    test -z "$as_dir" && as_dir=.
  4.1703      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1704 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1705 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1706      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  4.1707      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1708      break 2
  4.1709 @@ -6503,7 +6534,7 @@
  4.1710  set dummy objdump; ac_word=$2
  4.1711  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1712  $as_echo_n "checking for $ac_word... " >&6; }
  4.1713 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  4.1714 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  4.1715    $as_echo_n "(cached) " >&6
  4.1716  else
  4.1717    if test -n "$ac_ct_OBJDUMP"; then
  4.1718 @@ -6515,7 +6546,7 @@
  4.1719    IFS=$as_save_IFS
  4.1720    test -z "$as_dir" && as_dir=.
  4.1721      for ac_exec_ext in '' $ac_executable_extensions; do
  4.1722 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.1723 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1724      ac_cv_prog_ac_ct_OBJDUMP="objdump"
  4.1725      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1726      break 2
  4.1727 @@ -6740,7 +6771,7 @@
  4.1728  
  4.1729  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
  4.1730  $as_echo_n "checking for objdir... " >&6; }
  4.1731 -if test "${lt_cv_objdir+set}" = set; then :
  4.1732 +if ${lt_cv_objdir+:} false; then :
  4.1733    $as_echo_n "(cached) " >&6
  4.1734  else
  4.1735    rm -f .libs 2>/dev/null
  4.1736 @@ -6848,7 +6879,7 @@
  4.1737    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
  4.1738      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
  4.1739  $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
  4.1740 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
  4.1741 +if ${lt_cv_path_MAGIC_CMD+:} false; then :
  4.1742    $as_echo_n "(cached) " >&6
  4.1743  else
  4.1744    case $MAGIC_CMD in
  4.1745 @@ -6914,7 +6945,7 @@
  4.1746    if test -n "$ac_tool_prefix"; then
  4.1747      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
  4.1748  $as_echo_n "checking for file... " >&6; }
  4.1749 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
  4.1750 +if ${lt_cv_path_MAGIC_CMD+:} false; then :
  4.1751    $as_echo_n "(cached) " >&6
  4.1752  else
  4.1753    case $MAGIC_CMD in
  4.1754 @@ -7051,7 +7082,7 @@
  4.1755  
  4.1756    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  4.1757  $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
  4.1758 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
  4.1759 +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
  4.1760    $as_echo_n "(cached) " >&6
  4.1761  else
  4.1762    lt_cv_prog_compiler_rtti_exceptions=no
  4.1763 @@ -7067,11 +7098,11 @@
  4.1764     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  4.1765     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  4.1766     -e 's:$: $lt_compiler_flag:'`
  4.1767 -   (eval echo "\"\$as_me:7070: $lt_compile\"" >&5)
  4.1768 +   (eval echo "\"\$as_me:7101: $lt_compile\"" >&5)
  4.1769     (eval "$lt_compile" 2>conftest.err)
  4.1770     ac_status=$?
  4.1771     cat conftest.err >&5
  4.1772 -   echo "$as_me:7074: \$? = $ac_status" >&5
  4.1773 +   echo "$as_me:7105: \$? = $ac_status" >&5
  4.1774     if (exit $ac_status) && test -s "$ac_outfile"; then
  4.1775       # The compiler can only warn and ignore the option if not recognized
  4.1776       # So say no if there are warnings other than the usual output.
  4.1777 @@ -7390,7 +7421,7 @@
  4.1778  if test -n "$lt_prog_compiler_pic"; then
  4.1779    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  4.1780  $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
  4.1781 -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
  4.1782 +if ${lt_cv_prog_compiler_pic_works+:} false; then :
  4.1783    $as_echo_n "(cached) " >&6
  4.1784  else
  4.1785    lt_cv_prog_compiler_pic_works=no
  4.1786 @@ -7406,11 +7437,11 @@
  4.1787     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  4.1788     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  4.1789     -e 's:$: $lt_compiler_flag:'`
  4.1790 -   (eval echo "\"\$as_me:7409: $lt_compile\"" >&5)
  4.1791 +   (eval echo "\"\$as_me:7440: $lt_compile\"" >&5)
  4.1792     (eval "$lt_compile" 2>conftest.err)
  4.1793     ac_status=$?
  4.1794     cat conftest.err >&5
  4.1795 -   echo "$as_me:7413: \$? = $ac_status" >&5
  4.1796 +   echo "$as_me:7444: \$? = $ac_status" >&5
  4.1797     if (exit $ac_status) && test -s "$ac_outfile"; then
  4.1798       # The compiler can only warn and ignore the option if not recognized
  4.1799       # So say no if there are warnings other than the usual output.
  4.1800 @@ -7449,7 +7480,7 @@
  4.1801  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
  4.1802  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  4.1803  $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
  4.1804 -if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
  4.1805 +if ${lt_cv_prog_compiler_static_works+:} false; then :
  4.1806    $as_echo_n "(cached) " >&6
  4.1807  else
  4.1808    lt_cv_prog_compiler_static_works=no
  4.1809 @@ -7492,7 +7523,7 @@
  4.1810  
  4.1811    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
  4.1812  $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  4.1813 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
  4.1814 +if ${lt_cv_prog_compiler_c_o+:} false; then :
  4.1815    $as_echo_n "(cached) " >&6
  4.1816  else
  4.1817    lt_cv_prog_compiler_c_o=no
  4.1818 @@ -7511,11 +7542,11 @@
  4.1819     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  4.1820     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  4.1821     -e 's:$: $lt_compiler_flag:'`
  4.1822 -   (eval echo "\"\$as_me:7514: $lt_compile\"" >&5)
  4.1823 +   (eval echo "\"\$as_me:7545: $lt_compile\"" >&5)
  4.1824     (eval "$lt_compile" 2>out/conftest.err)
  4.1825     ac_status=$?
  4.1826     cat out/conftest.err >&5
  4.1827 -   echo "$as_me:7518: \$? = $ac_status" >&5
  4.1828 +   echo "$as_me:7549: \$? = $ac_status" >&5
  4.1829     if (exit $ac_status) && test -s out/conftest2.$ac_objext
  4.1830     then
  4.1831       # The compiler can only warn and ignore the option if not recognized
  4.1832 @@ -7547,7 +7578,7 @@
  4.1833  
  4.1834    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
  4.1835  $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  4.1836 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
  4.1837 +if ${lt_cv_prog_compiler_c_o+:} false; then :
  4.1838    $as_echo_n "(cached) " >&6
  4.1839  else
  4.1840    lt_cv_prog_compiler_c_o=no
  4.1841 @@ -7566,11 +7597,11 @@
  4.1842     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  4.1843     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  4.1844     -e 's:$: $lt_compiler_flag:'`
  4.1845 -   (eval echo "\"\$as_me:7569: $lt_compile\"" >&5)
  4.1846 +   (eval echo "\"\$as_me:7600: $lt_compile\"" >&5)
  4.1847     (eval "$lt_compile" 2>out/conftest.err)
  4.1848     ac_status=$?
  4.1849     cat out/conftest.err >&5
  4.1850 -   echo "$as_me:7573: \$? = $ac_status" >&5
  4.1851 +   echo "$as_me:7604: \$? = $ac_status" >&5
  4.1852     if (exit $ac_status) && test -s out/conftest2.$ac_objext
  4.1853     then
  4.1854       # The compiler can only warn and ignore the option if not recognized
  4.1855 @@ -9677,7 +9708,7 @@
  4.1856    # if libdl is installed we need to link against it
  4.1857      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  4.1858  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  4.1859 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  4.1860 +if ${ac_cv_lib_dl_dlopen+:} false; then :
  4.1861    $as_echo_n "(cached) " >&6
  4.1862  else
  4.1863    ac_check_lib_save_LIBS=$LIBS
  4.1864 @@ -9711,7 +9742,7 @@
  4.1865  fi
  4.1866  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  4.1867  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  4.1868 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  4.1869 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  4.1870    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  4.1871  else
  4.1872  
  4.1873 @@ -9725,12 +9756,12 @@
  4.1874  
  4.1875    *)
  4.1876      ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
  4.1877 -if test "x$ac_cv_func_shl_load" = x""yes; then :
  4.1878 +if test "x$ac_cv_func_shl_load" = xyes; then :
  4.1879    lt_cv_dlopen="shl_load"
  4.1880  else
  4.1881    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
  4.1882  $as_echo_n "checking for shl_load in -ldld... " >&6; }
  4.1883 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
  4.1884 +if ${ac_cv_lib_dld_shl_load+:} false; then :
  4.1885    $as_echo_n "(cached) " >&6
  4.1886  else
  4.1887    ac_check_lib_save_LIBS=$LIBS
  4.1888 @@ -9764,16 +9795,16 @@
  4.1889  fi
  4.1890  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
  4.1891  $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
  4.1892 -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
  4.1893 +if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
  4.1894    lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  4.1895  else
  4.1896    ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
  4.1897 -if test "x$ac_cv_func_dlopen" = x""yes; then :
  4.1898 +if test "x$ac_cv_func_dlopen" = xyes; then :
  4.1899    lt_cv_dlopen="dlopen"
  4.1900  else
  4.1901    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  4.1902  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  4.1903 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  4.1904 +if ${ac_cv_lib_dl_dlopen+:} false; then :
  4.1905    $as_echo_n "(cached) " >&6
  4.1906  else
  4.1907    ac_check_lib_save_LIBS=$LIBS
  4.1908 @@ -9807,12 +9838,12 @@
  4.1909  fi
  4.1910  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  4.1911  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  4.1912 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  4.1913 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  4.1914    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  4.1915  else
  4.1916    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
  4.1917  $as_echo_n "checking for dlopen in -lsvld... " >&6; }
  4.1918 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
  4.1919 +if ${ac_cv_lib_svld_dlopen+:} false; then :
  4.1920    $as_echo_n "(cached) " >&6
  4.1921  else
  4.1922    ac_check_lib_save_LIBS=$LIBS
  4.1923 @@ -9846,12 +9877,12 @@
  4.1924  fi
  4.1925  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
  4.1926  $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
  4.1927 -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
  4.1928 +if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
  4.1929    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
  4.1930  else
  4.1931    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
  4.1932  $as_echo_n "checking for dld_link in -ldld... " >&6; }
  4.1933 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
  4.1934 +if ${ac_cv_lib_dld_dld_link+:} false; then :
  4.1935    $as_echo_n "(cached) " >&6
  4.1936  else
  4.1937    ac_check_lib_save_LIBS=$LIBS
  4.1938 @@ -9885,7 +9916,7 @@
  4.1939  fi
  4.1940  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
  4.1941  $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
  4.1942 -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
  4.1943 +if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
  4.1944    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  4.1945  fi
  4.1946  
  4.1947 @@ -9926,7 +9957,7 @@
  4.1948  
  4.1949      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
  4.1950  $as_echo_n "checking whether a program can dlopen itself... " >&6; }
  4.1951 -if test "${lt_cv_dlopen_self+set}" = set; then :
  4.1952 +if ${lt_cv_dlopen_self+:} false; then :
  4.1953    $as_echo_n "(cached) " >&6
  4.1954  else
  4.1955    	  if test "$cross_compiling" = yes; then :
  4.1956 @@ -9935,7 +9966,7 @@
  4.1957    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  4.1958    lt_status=$lt_dlunknown
  4.1959    cat > conftest.$ac_ext <<_LT_EOF
  4.1960 -#line 9938 "configure"
  4.1961 +#line 9969 "configure"
  4.1962  #include "confdefs.h"
  4.1963  
  4.1964  #if HAVE_DLFCN_H
  4.1965 @@ -10022,7 +10053,7 @@
  4.1966        wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
  4.1967        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
  4.1968  $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
  4.1969 -if test "${lt_cv_dlopen_self_static+set}" = set; then :
  4.1970 +if ${lt_cv_dlopen_self_static+:} false; then :
  4.1971    $as_echo_n "(cached) " >&6
  4.1972  else
  4.1973    	  if test "$cross_compiling" = yes; then :
  4.1974 @@ -10031,7 +10062,7 @@
  4.1975    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  4.1976    lt_status=$lt_dlunknown
  4.1977    cat > conftest.$ac_ext <<_LT_EOF
  4.1978 -#line 10034 "configure"
  4.1979 +#line 10065 "configure"
  4.1980  #include "confdefs.h"
  4.1981  
  4.1982  #if HAVE_DLFCN_H
  4.1983 @@ -10290,7 +10321,7 @@
  4.1984  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  4.1985  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  4.1986  if test -z "$INSTALL"; then
  4.1987 -if test "${ac_cv_path_install+set}" = set; then :
  4.1988 +if ${ac_cv_path_install+:} false; then :
  4.1989    $as_echo_n "(cached) " >&6
  4.1990  else
  4.1991    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1992 @@ -10310,7 +10341,7 @@
  4.1993      # by default.
  4.1994      for ac_prog in ginstall scoinst install; do
  4.1995        for ac_exec_ext in '' $ac_executable_extensions; do
  4.1996 -	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  4.1997 +	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
  4.1998  	  if test $ac_prog = install &&
  4.1999  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  4.2000  	    # AIX install.  It has an incompatible calling convention.
  4.2001 @@ -10374,11 +10405,11 @@
  4.2002  '
  4.2003  case `pwd` in
  4.2004    *[\\\"\#\$\&\'\`$am_lf]*)
  4.2005 -    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
  4.2006 +    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
  4.2007  esac
  4.2008  case $srcdir in
  4.2009    *[\\\"\#\$\&\'\`$am_lf\ \	]*)
  4.2010 -    as_fn_error "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
  4.2011 +    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
  4.2012  esac
  4.2013  
  4.2014  # Do 'set' in a subshell so we don't clobber the current shell's
  4.2015 @@ -10402,7 +10433,7 @@
  4.2016  	# if, for instance, CONFIG_SHELL is bash and it inherits a
  4.2017  	# broken ls alias from the environment.  This has actually
  4.2018  	# happened.  Such a system could not be considered "sane".
  4.2019 -	as_fn_error "ls -t appears to fail.  Make sure there is not a broken
  4.2020 +	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
  4.2021    alias in your environment" "$LINENO" 5
  4.2022       fi
  4.2023       if test "$2" = conftest.file || test $am_try -eq 2; then
  4.2024 @@ -10418,7 +10449,7 @@
  4.2025     # Ok.
  4.2026     :
  4.2027  else
  4.2028 -   as_fn_error "newly created file is older than distributed files!
  4.2029 +   as_fn_error $? "newly created file is older than distributed files!
  4.2030  Check your system clock" "$LINENO" 5
  4.2031  fi
  4.2032  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  4.2033 @@ -10479,7 +10510,7 @@
  4.2034  set dummy ${ac_tool_prefix}strip; ac_word=$2
  4.2035  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2036  $as_echo_n "checking for $ac_word... " >&6; }
  4.2037 -if test "${ac_cv_prog_STRIP+set}" = set; then :
  4.2038 +if ${ac_cv_prog_STRIP+:} false; then :
  4.2039    $as_echo_n "(cached) " >&6
  4.2040  else
  4.2041    if test -n "$STRIP"; then
  4.2042 @@ -10491,7 +10522,7 @@
  4.2043    IFS=$as_save_IFS
  4.2044    test -z "$as_dir" && as_dir=.
  4.2045      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2046 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2047 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2048      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  4.2049      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2050      break 2
  4.2051 @@ -10519,7 +10550,7 @@
  4.2052  set dummy strip; ac_word=$2
  4.2053  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2054  $as_echo_n "checking for $ac_word... " >&6; }
  4.2055 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  4.2056 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  4.2057    $as_echo_n "(cached) " >&6
  4.2058  else
  4.2059    if test -n "$ac_ct_STRIP"; then
  4.2060 @@ -10531,7 +10562,7 @@
  4.2061    IFS=$as_save_IFS
  4.2062    test -z "$as_dir" && as_dir=.
  4.2063      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2064 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2065 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2066      ac_cv_prog_ac_ct_STRIP="strip"
  4.2067      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2068      break 2
  4.2069 @@ -10572,7 +10603,7 @@
  4.2070  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  4.2071  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  4.2072  if test -z "$MKDIR_P"; then
  4.2073 -  if test "${ac_cv_path_mkdir+set}" = set; then :
  4.2074 +  if ${ac_cv_path_mkdir+:} false; then :
  4.2075    $as_echo_n "(cached) " >&6
  4.2076  else
  4.2077    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2078 @@ -10582,7 +10613,7 @@
  4.2079    test -z "$as_dir" && as_dir=.
  4.2080      for ac_prog in mkdir gmkdir; do
  4.2081  	 for ac_exec_ext in '' $ac_executable_extensions; do
  4.2082 -	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  4.2083 +	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
  4.2084  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
  4.2085  	     'mkdir (GNU coreutils) '* | \
  4.2086  	     'mkdir (coreutils) '* | \
  4.2087 @@ -10617,7 +10648,7 @@
  4.2088  set dummy $ac_prog; ac_word=$2
  4.2089  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2090  $as_echo_n "checking for $ac_word... " >&6; }
  4.2091 -if test "${ac_cv_prog_AWK+set}" = set; then :
  4.2092 +if ${ac_cv_prog_AWK+:} false; then :
  4.2093    $as_echo_n "(cached) " >&6
  4.2094  else
  4.2095    if test -n "$AWK"; then
  4.2096 @@ -10629,7 +10660,7 @@
  4.2097    IFS=$as_save_IFS
  4.2098    test -z "$as_dir" && as_dir=.
  4.2099      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2100 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2101 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2102      ac_cv_prog_AWK="$ac_prog"
  4.2103      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2104      break 2
  4.2105 @@ -10657,7 +10688,7 @@
  4.2106  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  4.2107  set x ${MAKE-make}
  4.2108  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  4.2109 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
  4.2110 +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
  4.2111    $as_echo_n "(cached) " >&6
  4.2112  else
  4.2113    cat >conftest.make <<\_ACEOF
  4.2114 @@ -10665,7 +10696,7 @@
  4.2115  all:
  4.2116  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  4.2117  _ACEOF
  4.2118 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  4.2119 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
  4.2120  case `${MAKE-make} -f conftest.make 2>/dev/null` in
  4.2121    *@@@%%%=?*=@@@%%%*)
  4.2122      eval ac_cv_prog_make_${ac_make}_set=yes;;
  4.2123 @@ -10769,7 +10800,7 @@
  4.2124  am_make=${MAKE-make}
  4.2125  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
  4.2126  $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
  4.2127 -if test "${am_cv_make_support_nested_variables+set}" = set; then :
  4.2128 +if ${am_cv_make_support_nested_variables+:} false; then :
  4.2129    $as_echo_n "(cached) " >&6
  4.2130  else
  4.2131    if $as_echo 'TRUE=$(BAR$(V))
  4.2132 @@ -10801,7 +10832,7 @@
  4.2133    am__isrc=' -I$(srcdir)'
  4.2134    # test to see if srcdir already configured
  4.2135    if test -f $srcdir/config.status; then
  4.2136 -    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  4.2137 +    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  4.2138    fi
  4.2139  fi
  4.2140  
  4.2141 @@ -10872,7 +10903,7 @@
  4.2142  
  4.2143  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  4.2144  $as_echo_n "checking dependency style of $depcc... " >&6; }
  4.2145 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
  4.2146 +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
  4.2147    $as_echo_n "(cached) " >&6
  4.2148  else
  4.2149    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  4.2150 @@ -11035,7 +11066,7 @@
  4.2151  to "yes", and re-run configure.
  4.2152  
  4.2153  END
  4.2154 -    as_fn_error "Your 'rm' program is bad, sorry." "$LINENO" 5
  4.2155 +    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
  4.2156    fi
  4.2157  fi
  4.2158  
  4.2159 @@ -11051,7 +11082,7 @@
  4.2160  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  4.2161  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2162  $as_echo_n "checking for $ac_word... " >&6; }
  4.2163 -if test "${ac_cv_prog_CC+set}" = set; then :
  4.2164 +if ${ac_cv_prog_CC+:} false; then :
  4.2165    $as_echo_n "(cached) " >&6
  4.2166  else
  4.2167    if test -n "$CC"; then
  4.2168 @@ -11063,7 +11094,7 @@
  4.2169    IFS=$as_save_IFS
  4.2170    test -z "$as_dir" && as_dir=.
  4.2171      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2172 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2173 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2174      ac_cv_prog_CC="${ac_tool_prefix}gcc"
  4.2175      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2176      break 2
  4.2177 @@ -11091,7 +11122,7 @@
  4.2178  set dummy gcc; ac_word=$2
  4.2179  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2180  $as_echo_n "checking for $ac_word... " >&6; }
  4.2181 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  4.2182 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  4.2183    $as_echo_n "(cached) " >&6
  4.2184  else
  4.2185    if test -n "$ac_ct_CC"; then
  4.2186 @@ -11103,7 +11134,7 @@
  4.2187    IFS=$as_save_IFS
  4.2188    test -z "$as_dir" && as_dir=.
  4.2189      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2190 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2191 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2192      ac_cv_prog_ac_ct_CC="gcc"
  4.2193      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2194      break 2
  4.2195 @@ -11144,7 +11175,7 @@
  4.2196  set dummy ${ac_tool_prefix}cc; ac_word=$2
  4.2197  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2198  $as_echo_n "checking for $ac_word... " >&6; }
  4.2199 -if test "${ac_cv_prog_CC+set}" = set; then :
  4.2200 +if ${ac_cv_prog_CC+:} false; then :
  4.2201    $as_echo_n "(cached) " >&6
  4.2202  else
  4.2203    if test -n "$CC"; then
  4.2204 @@ -11156,7 +11187,7 @@
  4.2205    IFS=$as_save_IFS
  4.2206    test -z "$as_dir" && as_dir=.
  4.2207      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2208 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2209 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2210      ac_cv_prog_CC="${ac_tool_prefix}cc"
  4.2211      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2212      break 2
  4.2213 @@ -11184,7 +11215,7 @@
  4.2214  set dummy cc; ac_word=$2
  4.2215  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2216  $as_echo_n "checking for $ac_word... " >&6; }
  4.2217 -if test "${ac_cv_prog_CC+set}" = set; then :
  4.2218 +if ${ac_cv_prog_CC+:} false; then :
  4.2219    $as_echo_n "(cached) " >&6
  4.2220  else
  4.2221    if test -n "$CC"; then
  4.2222 @@ -11197,7 +11228,7 @@
  4.2223    IFS=$as_save_IFS
  4.2224    test -z "$as_dir" && as_dir=.
  4.2225      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2226 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2227 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2228      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
  4.2229         ac_prog_rejected=yes
  4.2230         continue
  4.2231 @@ -11243,7 +11274,7 @@
  4.2232  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  4.2233  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2234  $as_echo_n "checking for $ac_word... " >&6; }
  4.2235 -if test "${ac_cv_prog_CC+set}" = set; then :
  4.2236 +if ${ac_cv_prog_CC+:} false; then :
  4.2237    $as_echo_n "(cached) " >&6
  4.2238  else
  4.2239    if test -n "$CC"; then
  4.2240 @@ -11255,7 +11286,7 @@
  4.2241    IFS=$as_save_IFS
  4.2242    test -z "$as_dir" && as_dir=.
  4.2243      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2244 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2245 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2246      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
  4.2247      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2248      break 2
  4.2249 @@ -11287,7 +11318,7 @@
  4.2250  set dummy $ac_prog; ac_word=$2
  4.2251  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2252  $as_echo_n "checking for $ac_word... " >&6; }
  4.2253 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  4.2254 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  4.2255    $as_echo_n "(cached) " >&6
  4.2256  else
  4.2257    if test -n "$ac_ct_CC"; then
  4.2258 @@ -11299,7 +11330,7 @@
  4.2259    IFS=$as_save_IFS
  4.2260    test -z "$as_dir" && as_dir=.
  4.2261      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2262 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2263 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2264      ac_cv_prog_ac_ct_CC="$ac_prog"
  4.2265      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2266      break 2
  4.2267 @@ -11341,8 +11372,8 @@
  4.2268  
  4.2269  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  4.2270  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  4.2271 -as_fn_error "no acceptable C compiler found in \$PATH
  4.2272 -See \`config.log' for more details." "$LINENO" 5; }
  4.2273 +as_fn_error $? "no acceptable C compiler found in \$PATH
  4.2274 +See \`config.log' for more details" "$LINENO" 5; }
  4.2275  
  4.2276  # Provide some information about the compiler.
  4.2277  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  4.2278 @@ -11371,7 +11402,7 @@
  4.2279  
  4.2280  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  4.2281  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  4.2282 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  4.2283 +if ${ac_cv_c_compiler_gnu+:} false; then :
  4.2284    $as_echo_n "(cached) " >&6
  4.2285  else
  4.2286    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4.2287 @@ -11408,7 +11439,7 @@
  4.2288  ac_save_CFLAGS=$CFLAGS
  4.2289  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  4.2290  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  4.2291 -if test "${ac_cv_prog_cc_g+set}" = set; then :
  4.2292 +if ${ac_cv_prog_cc_g+:} false; then :
  4.2293    $as_echo_n "(cached) " >&6
  4.2294  else
  4.2295    ac_save_c_werror_flag=$ac_c_werror_flag
  4.2296 @@ -11486,7 +11517,7 @@
  4.2297  fi
  4.2298  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  4.2299  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  4.2300 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
  4.2301 +if ${ac_cv_prog_cc_c89+:} false; then :
  4.2302    $as_echo_n "(cached) " >&6
  4.2303  else
  4.2304    ac_cv_prog_cc_c89=no
  4.2305 @@ -11495,8 +11526,7 @@
  4.2306  /* end confdefs.h.  */
  4.2307  #include <stdarg.h>
  4.2308  #include <stdio.h>
  4.2309 -#include <sys/types.h>
  4.2310 -#include <sys/stat.h>
  4.2311 +struct stat;
  4.2312  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  4.2313  struct buf { int x; };
  4.2314  FILE * (*rcsopen) (struct buf *, struct stat *, int);
  4.2315 @@ -11588,7 +11618,7 @@
  4.2316  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  4.2317  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
  4.2318  $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
  4.2319 -if test "${am_cv_prog_cc_c_o+set}" = set; then :
  4.2320 +if ${am_cv_prog_cc_c_o+:} false; then :
  4.2321    $as_echo_n "(cached) " >&6
  4.2322  else
  4.2323    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4.2324 @@ -11652,7 +11682,7 @@
  4.2325  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  4.2326  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2327  $as_echo_n "checking for $ac_word... " >&6; }
  4.2328 -if test "${ac_cv_prog_OBJC+set}" = set; then :
  4.2329 +if ${ac_cv_prog_OBJC+:} false; then :
  4.2330    $as_echo_n "(cached) " >&6
  4.2331  else
  4.2332    if test -n "$OBJC"; then
  4.2333 @@ -11664,7 +11694,7 @@
  4.2334    IFS=$as_save_IFS
  4.2335    test -z "$as_dir" && as_dir=.
  4.2336      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2337 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2338 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2339      ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
  4.2340      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2341      break 2
  4.2342 @@ -11696,7 +11726,7 @@
  4.2343  set dummy $ac_prog; ac_word=$2
  4.2344  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2345  $as_echo_n "checking for $ac_word... " >&6; }
  4.2346 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
  4.2347 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
  4.2348    $as_echo_n "(cached) " >&6
  4.2349  else
  4.2350    if test -n "$ac_ct_OBJC"; then
  4.2351 @@ -11708,7 +11738,7 @@
  4.2352    IFS=$as_save_IFS
  4.2353    test -z "$as_dir" && as_dir=.
  4.2354      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2355 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2356 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2357      ac_cv_prog_ac_ct_OBJC="$ac_prog"
  4.2358      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2359      break 2
  4.2360 @@ -11772,7 +11802,7 @@
  4.2361  
  4.2362  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
  4.2363  $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
  4.2364 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
  4.2365 +if ${ac_cv_objc_compiler_gnu+:} false; then :
  4.2366    $as_echo_n "(cached) " >&6
  4.2367  else
  4.2368    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4.2369 @@ -11809,7 +11839,7 @@
  4.2370  ac_save_OBJCFLAGS=$OBJCFLAGS
  4.2371  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
  4.2372  $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
  4.2373 -if test "${ac_cv_prog_objc_g+set}" = set; then :
  4.2374 +if ${ac_cv_prog_objc_g+:} false; then :
  4.2375    $as_echo_n "(cached) " >&6
  4.2376  else
  4.2377    ac_save_objc_werror_flag=$ac_objc_werror_flag
  4.2378 @@ -11895,7 +11925,7 @@
  4.2379  
  4.2380  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  4.2381  $as_echo_n "checking dependency style of $depcc... " >&6; }
  4.2382 -if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then :
  4.2383 +if ${am_cv_OBJC_dependencies_compiler_type+:} false; then :
  4.2384    $as_echo_n "(cached) " >&6
  4.2385  else
  4.2386    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  4.2387 @@ -12019,7 +12049,7 @@
  4.2388  
  4.2389  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
  4.2390  $as_echo_n "checking for inline... " >&6; }
  4.2391 -if test "${ac_cv_c_inline+set}" = set; then :
  4.2392 +if ${ac_cv_c_inline+:} false; then :
  4.2393    $as_echo_n "(cached) " >&6
  4.2394  else
  4.2395    ac_cv_c_inline=no
  4.2396 @@ -12064,7 +12094,7 @@
  4.2397  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  4.2398  set x ${MAKE-make}
  4.2399  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  4.2400 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
  4.2401 +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
  4.2402    $as_echo_n "(cached) " >&6
  4.2403  else
  4.2404    cat >conftest.make <<\_ACEOF
  4.2405 @@ -12072,7 +12102,7 @@
  4.2406  all:
  4.2407  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  4.2408  _ACEOF
  4.2409 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  4.2410 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
  4.2411  case `${MAKE-make} -f conftest.make 2>/dev/null` in
  4.2412    *@@@%%%=?*=@@@%%%*)
  4.2413      eval ac_cv_prog_make_${ac_make}_set=yes;;
  4.2414 @@ -12102,7 +12132,7 @@
  4.2415  set dummy $ac_prog; ac_word=$2
  4.2416  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2417  $as_echo_n "checking for $ac_word... " >&6; }
  4.2418 -if test "${ac_cv_prog_WINDRES+set}" = set; then :
  4.2419 +if ${ac_cv_prog_WINDRES+:} false; then :
  4.2420    $as_echo_n "(cached) " >&6
  4.2421  else
  4.2422    if test -n "$WINDRES"; then
  4.2423 @@ -12114,7 +12144,7 @@
  4.2424    IFS=$as_save_IFS
  4.2425    test -z "$as_dir" && as_dir=.
  4.2426      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2427 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2428 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2429      ac_cv_prog_WINDRES="$ac_prog"
  4.2430      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2431      break 2
  4.2432 @@ -12350,14 +12380,14 @@
  4.2433  
  4.2434  if (test x$enable_jpg = xyes || test x$enable_tif = xyes) && test x$enable_imageio != xyes; then
  4.2435      ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
  4.2436 -if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
  4.2437 +if test "x$ac_cv_header_jpeglib_h" = xyes; then :
  4.2438    have_jpg_hdr=yes
  4.2439  fi
  4.2440  
  4.2441  
  4.2442      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateDecompress in -ljpeg" >&5
  4.2443  $as_echo_n "checking for jpeg_CreateDecompress in -ljpeg... " >&6; }
  4.2444 -if test "${ac_cv_lib_jpeg_jpeg_CreateDecompress+set}" = set; then :
  4.2445 +if ${ac_cv_lib_jpeg_jpeg_CreateDecompress+:} false; then :
  4.2446    $as_echo_n "(cached) " >&6
  4.2447  else
  4.2448    ac_check_lib_save_LIBS=$LIBS
  4.2449 @@ -12391,7 +12421,7 @@
  4.2450  fi
  4.2451  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_CreateDecompress" >&5
  4.2452  $as_echo "$ac_cv_lib_jpeg_jpeg_CreateDecompress" >&6; }
  4.2453 -if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = x""yes; then :
  4.2454 +if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = xyes; then :
  4.2455    have_jpg_lib=yes
  4.2456  fi
  4.2457  
  4.2458 @@ -12433,7 +12463,7 @@
  4.2459  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  4.2460  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2461  $as_echo_n "checking for $ac_word... " >&6; }
  4.2462 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  4.2463 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
  4.2464    $as_echo_n "(cached) " >&6
  4.2465  else
  4.2466    case $PKG_CONFIG in
  4.2467 @@ -12447,7 +12477,7 @@
  4.2468    IFS=$as_save_IFS
  4.2469    test -z "$as_dir" && as_dir=.
  4.2470      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2471 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2472 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2473      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  4.2474      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2475      break 2
  4.2476 @@ -12476,7 +12506,7 @@
  4.2477  set dummy pkg-config; ac_word=$2
  4.2478  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2479  $as_echo_n "checking for $ac_word... " >&6; }
  4.2480 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
  4.2481 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
  4.2482    $as_echo_n "(cached) " >&6
  4.2483  else
  4.2484    case $ac_pt_PKG_CONFIG in
  4.2485 @@ -12490,7 +12520,7 @@
  4.2486    IFS=$as_save_IFS
  4.2487    test -z "$as_dir" && as_dir=.
  4.2488      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2489 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2490 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2491      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  4.2492      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2493      break 2
  4.2494 @@ -12603,7 +12633,7 @@
  4.2495  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2496  $as_echo "no" >&6; }
  4.2497                          ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
  4.2498 -if test "x$ac_cv_header_png_h" = x""yes; then :
  4.2499 +if test "x$ac_cv_header_png_h" = xyes; then :
  4.2500  
  4.2501              have_png_hdr=yes
  4.2502              LIBPNG_CFLAGS=""
  4.2503 @@ -12613,7 +12643,7 @@
  4.2504  
  4.2505          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in -lpng" >&5
  4.2506  $as_echo_n "checking for png_create_read_struct in -lpng... " >&6; }
  4.2507 -if test "${ac_cv_lib_png_png_create_read_struct+set}" = set; then :
  4.2508 +if ${ac_cv_lib_png_png_create_read_struct+:} false; then :
  4.2509    $as_echo_n "(cached) " >&6
  4.2510  else
  4.2511    ac_check_lib_save_LIBS=$LIBS
  4.2512 @@ -12647,7 +12677,7 @@
  4.2513  fi
  4.2514  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5
  4.2515  $as_echo "$ac_cv_lib_png_png_create_read_struct" >&6; }
  4.2516 -if test "x$ac_cv_lib_png_png_create_read_struct" = x""yes; then :
  4.2517 +if test "x$ac_cv_lib_png_png_create_read_struct" = xyes; then :
  4.2518  
  4.2519              have_png_lib=yes
  4.2520              LIBPNG_LIBS="-lpng -lz"
  4.2521 @@ -12657,7 +12687,7 @@
  4.2522  
  4.2523  elif test $pkg_failed = untried; then
  4.2524  	        ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
  4.2525 -if test "x$ac_cv_header_png_h" = x""yes; then :
  4.2526 +if test "x$ac_cv_header_png_h" = xyes; then :
  4.2527  
  4.2528              have_png_hdr=yes
  4.2529              LIBPNG_CFLAGS=""
  4.2530 @@ -12667,7 +12697,7 @@
  4.2531  
  4.2532          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in -lpng" >&5
  4.2533  $as_echo_n "checking for png_create_read_struct in -lpng... " >&6; }
  4.2534 -if test "${ac_cv_lib_png_png_create_read_struct+set}" = set; then :
  4.2535 +if ${ac_cv_lib_png_png_create_read_struct+:} false; then :
  4.2536    $as_echo_n "(cached) " >&6
  4.2537  else
  4.2538    ac_check_lib_save_LIBS=$LIBS
  4.2539 @@ -12701,7 +12731,7 @@
  4.2540  fi
  4.2541  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5
  4.2542  $as_echo "$ac_cv_lib_png_png_create_read_struct" >&6; }
  4.2543 -if test "x$ac_cv_lib_png_png_create_read_struct" = x""yes; then :
  4.2544 +if test "x$ac_cv_lib_png_png_create_read_struct" = xyes; then :
  4.2545  
  4.2546              have_png_lib=yes
  4.2547              LIBPNG_LIBS="-lpng -lz"
  4.2548 @@ -12746,14 +12776,14 @@
  4.2549  
  4.2550  if test x$enable_tif = xyes -a x$enable_imageio != xyes; then
  4.2551      ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
  4.2552 -if test "x$ac_cv_header_tiffio_h" = x""yes; then :
  4.2553 +if test "x$ac_cv_header_tiffio_h" = xyes; then :
  4.2554    have_tif_hdr=yes
  4.2555  fi
  4.2556  
  4.2557  
  4.2558      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
  4.2559  $as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
  4.2560 -if test "${ac_cv_lib_tiff_TIFFClientOpen+set}" = set; then :
  4.2561 +if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
  4.2562    $as_echo_n "(cached) " >&6
  4.2563  else
  4.2564    ac_check_lib_save_LIBS=$LIBS
  4.2565 @@ -12787,7 +12817,7 @@
  4.2566  fi
  4.2567  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
  4.2568  $as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
  4.2569 -if test "x$ac_cv_lib_tiff_TIFFClientOpen" = x""yes; then :
  4.2570 +if test "x$ac_cv_lib_tiff_TIFFClientOpen" = xyes; then :
  4.2571    have_tif_lib=yes
  4.2572  fi
  4.2573  
  4.2574 @@ -12885,7 +12915,7 @@
  4.2575  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2576  $as_echo "no" >&6; }
  4.2577                          ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default"
  4.2578 -if test "x$ac_cv_header_webp_decode_h" = x""yes; then :
  4.2579 +if test "x$ac_cv_header_webp_decode_h" = xyes; then :
  4.2580  
  4.2581              have_webp_hdr=yes
  4.2582              LIBWEBP_CFLAGS=""
  4.2583 @@ -12896,7 +12926,7 @@
  4.2584          as_ac_Lib=`$as_echo "ac_cv_lib_$webplib''_WebPGetDecoderVersion" | $as_tr_sh`
  4.2585  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebPGetDecoderVersion in -l$webplib" >&5
  4.2586  $as_echo_n "checking for WebPGetDecoderVersion in -l$webplib... " >&6; }
  4.2587 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
  4.2588 +if eval \${$as_ac_Lib+:} false; then :
  4.2589    $as_echo_n "(cached) " >&6
  4.2590  else
  4.2591    ac_check_lib_save_LIBS=$LIBS
  4.2592 @@ -12931,8 +12961,7 @@
  4.2593  eval ac_res=\$$as_ac_Lib
  4.2594  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  4.2595  $as_echo "$ac_res" >&6; }
  4.2596 -eval as_val=\$$as_ac_Lib
  4.2597 -   if test "x$as_val" = x""yes; then :
  4.2598 +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
  4.2599  
  4.2600              have_webp_lib=yes
  4.2601              LIBWEBP_LIBS="-l$webplib"
  4.2602 @@ -12942,7 +12971,7 @@
  4.2603  
  4.2604  elif test $pkg_failed = untried; then
  4.2605  	        ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default"
  4.2606 -if test "x$ac_cv_header_webp_decode_h" = x""yes; then :
  4.2607 +if test "x$ac_cv_header_webp_decode_h" = xyes; then :
  4.2608  
  4.2609              have_webp_hdr=yes
  4.2610              LIBWEBP_CFLAGS=""
  4.2611 @@ -12953,7 +12982,7 @@
  4.2612          as_ac_Lib=`$as_echo "ac_cv_lib_$webplib''_WebPGetDecoderVersion" | $as_tr_sh`
  4.2613  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebPGetDecoderVersion in -l$webplib" >&5
  4.2614  $as_echo_n "checking for WebPGetDecoderVersion in -l$webplib... " >&6; }
  4.2615 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
  4.2616 +if eval \${$as_ac_Lib+:} false; then :
  4.2617    $as_echo_n "(cached) " >&6
  4.2618  else
  4.2619    ac_check_lib_save_LIBS=$LIBS
  4.2620 @@ -12988,8 +13017,7 @@
  4.2621  eval ac_res=\$$as_ac_Lib
  4.2622  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  4.2623  $as_echo "$ac_res" >&6; }
  4.2624 -eval as_val=\$$as_ac_Lib
  4.2625 -   if test "x$as_val" = x""yes; then :
  4.2626 +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
  4.2627  
  4.2628              have_webp_lib=yes
  4.2629              LIBWEBP_LIBS="-l$webplib"
  4.2630 @@ -13262,7 +13290,7 @@
  4.2631  set dummy sdl2-config; ac_word=$2
  4.2632  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2633  $as_echo_n "checking for $ac_word... " >&6; }
  4.2634 -if test "${ac_cv_path_SDL2_CONFIG+set}" = set; then :
  4.2635 +if ${ac_cv_path_SDL2_CONFIG+:} false; then :
  4.2636    $as_echo_n "(cached) " >&6
  4.2637  else
  4.2638    case $SDL2_CONFIG in
  4.2639 @@ -13276,7 +13304,7 @@
  4.2640    IFS=$as_save_IFS
  4.2641    test -z "$as_dir" && as_dir=.
  4.2642      for ac_exec_ext in '' $ac_executable_extensions; do
  4.2643 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  4.2644 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2645      ac_cv_path_SDL2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  4.2646      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2647      break 2
  4.2648 @@ -13470,7 +13498,7 @@
  4.2649       fi
  4.2650       SDL_CFLAGS=""
  4.2651       SDL_LIBS=""
  4.2652 -     as_fn_error "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
  4.2653 +     as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
  4.2654  
  4.2655    fi
  4.2656  
  4.2657 @@ -13552,10 +13580,21 @@
  4.2658       :end' >>confcache
  4.2659  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  4.2660    if test -w "$cache_file"; then
  4.2661 -    test "x$cache_file" != "x/dev/null" &&
  4.2662 +    if test "x$cache_file" != "x/dev/null"; then
  4.2663        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  4.2664  $as_echo "$as_me: updating cache $cache_file" >&6;}
  4.2665 -    cat confcache >$cache_file
  4.2666 +      if test ! -f "$cache_file" || test -h "$cache_file"; then
  4.2667 +	cat confcache >"$cache_file"
  4.2668 +      else
  4.2669 +        case $cache_file in #(
  4.2670 +        */* | ?:*)
  4.2671 +	  mv -f confcache "$cache_file"$$ &&
  4.2672 +	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  4.2673 +        *)
  4.2674 +	  mv -f confcache "$cache_file" ;;
  4.2675 +	esac
  4.2676 +      fi
  4.2677 +    fi
  4.2678    else
  4.2679      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  4.2680  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  4.2681 @@ -13607,6 +13646,7 @@
  4.2682  
  4.2683  ac_libobjs=
  4.2684  ac_ltlibobjs=
  4.2685 +U=
  4.2686  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
  4.2687    # 1. Remove the extension, and $U if already installed.
  4.2688    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
  4.2689 @@ -13630,11 +13670,11 @@
  4.2690     { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
  4.2691  $as_echo "done" >&6; }
  4.2692  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
  4.2693 -  as_fn_error "conditional \"AMDEP\" was never defined.
  4.2694 +  as_fn_error $? "conditional \"AMDEP\" was never defined.
  4.2695  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4.2696  fi
  4.2697  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
  4.2698 -  as_fn_error "conditional \"am__fastdepCC\" was never defined.
  4.2699 +  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
  4.2700  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4.2701  fi
  4.2702   if test -n "$EXEEXT"; then
  4.2703 @@ -13646,19 +13686,19 @@
  4.2704  fi
  4.2705  
  4.2706  if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
  4.2707 -  as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
  4.2708 +  as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
  4.2709  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4.2710  fi
  4.2711  if test -z "${USE_IMAGEIO_TRUE}" && test -z "${USE_IMAGEIO_FALSE}"; then
  4.2712 -  as_fn_error "conditional \"USE_IMAGEIO\" was never defined.
  4.2713 +  as_fn_error $? "conditional \"USE_IMAGEIO\" was never defined.
  4.2714  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4.2715  fi
  4.2716  if test -z "${USE_VERSION_RC_TRUE}" && test -z "${USE_VERSION_RC_FALSE}"; then
  4.2717 -  as_fn_error "conditional \"USE_VERSION_RC\" was never defined.
  4.2718 +  as_fn_error $? "conditional \"USE_VERSION_RC\" was never defined.
  4.2719  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4.2720  fi
  4.2721  
  4.2722 -: ${CONFIG_STATUS=./config.status}
  4.2723 +: "${CONFIG_STATUS=./config.status}"
  4.2724  ac_write_fail=0
  4.2725  ac_clean_files_save=$ac_clean_files
  4.2726  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  4.2727 @@ -13759,6 +13799,7 @@
  4.2728  IFS=" ""	$as_nl"
  4.2729  
  4.2730  # Find who we are.  Look in the path if we contain no directory separator.
  4.2731 +as_myself=
  4.2732  case $0 in #((
  4.2733    *[\\/]* ) as_myself=$0 ;;
  4.2734    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2735 @@ -13804,19 +13845,19 @@
  4.2736  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  4.2737  
  4.2738  
  4.2739 -# as_fn_error ERROR [LINENO LOG_FD]
  4.2740 -# ---------------------------------
  4.2741 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
  4.2742 +# ----------------------------------------
  4.2743  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  4.2744  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  4.2745 -# script with status $?, using 1 if that was 0.
  4.2746 +# script with STATUS, using 1 if that was 0.
  4.2747  as_fn_error ()
  4.2748  {
  4.2749 -  as_status=$?; test $as_status -eq 0 && as_status=1
  4.2750 -  if test "$3"; then
  4.2751 -    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  4.2752 -    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  4.2753 -  fi
  4.2754 -  $as_echo "$as_me: error: $1" >&2
  4.2755 +  as_status=$1; test $as_status -eq 0 && as_status=1
  4.2756 +  if test "$4"; then
  4.2757 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  4.2758 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  4.2759 +  fi
  4.2760 +  $as_echo "$as_me: error: $2" >&2
  4.2761    as_fn_exit $as_status
  4.2762  } # as_fn_error
  4.2763  
  4.2764 @@ -13954,16 +13995,16 @@
  4.2765      # ... but there are two gotchas:
  4.2766      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
  4.2767      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
  4.2768 -    # In both cases, we have to default to `cp -p'.
  4.2769 +    # In both cases, we have to default to `cp -pR'.
  4.2770      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
  4.2771 -      as_ln_s='cp -p'
  4.2772 +      as_ln_s='cp -pR'
  4.2773    elif ln conf$$.file conf$$ 2>/dev/null; then
  4.2774      as_ln_s=ln
  4.2775    else
  4.2776 -    as_ln_s='cp -p'
  4.2777 -  fi
  4.2778 -else
  4.2779 -  as_ln_s='cp -p'
  4.2780 +    as_ln_s='cp -pR'
  4.2781 +  fi
  4.2782 +else
  4.2783 +  as_ln_s='cp -pR'
  4.2784  fi
  4.2785  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  4.2786  rmdir conf$$.dir 2>/dev/null
  4.2787 @@ -14012,7 +14053,7 @@
  4.2788        test -d "$as_dir" && break
  4.2789      done
  4.2790      test -z "$as_dirs" || eval "mkdir $as_dirs"
  4.2791 -  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  4.2792 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  4.2793  
  4.2794  
  4.2795  } # as_fn_mkdir_p
  4.2796 @@ -14023,28 +14064,16 @@
  4.2797    as_mkdir_p=false
  4.2798  fi
  4.2799  
  4.2800 -if test -x / >/dev/null 2>&1; then
  4.2801 -  as_test_x='test -x'
  4.2802 -else
  4.2803 -  if ls -dL / >/dev/null 2>&1; then
  4.2804 -    as_ls_L_option=L
  4.2805 -  else
  4.2806 -    as_ls_L_option=
  4.2807 -  fi
  4.2808 -  as_test_x='
  4.2809 -    eval sh -c '\''
  4.2810 -      if test -d "$1"; then
  4.2811 -	test -d "$1/.";
  4.2812 -      else
  4.2813 -	case $1 in #(
  4.2814 -	-*)set "./$1";;
  4.2815 -	esac;
  4.2816 -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  4.2817 -	???[sx]*):;;*)false;;esac;fi
  4.2818 -    '\'' sh
  4.2819 -  '
  4.2820 -fi
  4.2821 -as_executable_p=$as_test_x
  4.2822 +
  4.2823 +# as_fn_executable_p FILE
  4.2824 +# -----------------------
  4.2825 +# Test if FILE is an executable regular file.
  4.2826 +as_fn_executable_p ()
  4.2827 +{
  4.2828 +  test -f "$1" && test -x "$1"
  4.2829 +} # as_fn_executable_p
  4.2830 +as_test_x='test -x'
  4.2831 +as_executable_p=as_fn_executable_p
  4.2832  
  4.2833  # Sed expression to map a string onto a valid CPP name.
  4.2834  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  4.2835 @@ -14066,7 +14095,7 @@
  4.2836  # values after options handling.
  4.2837  ac_log="
  4.2838  This file was extended by $as_me, which was
  4.2839 -generated by GNU Autoconf 2.65.  Invocation command line was
  4.2840 +generated by GNU Autoconf 2.69.  Invocation command line was
  4.2841  
  4.2842    CONFIG_FILES    = $CONFIG_FILES
  4.2843    CONFIG_HEADERS  = $CONFIG_HEADERS
  4.2844 @@ -14123,10 +14152,10 @@
  4.2845  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  4.2846  ac_cs_version="\\
  4.2847  config.status
  4.2848 -configured by $0, generated by GNU Autoconf 2.65,
  4.2849 +configured by $0, generated by GNU Autoconf 2.69,
  4.2850    with options \\"\$ac_cs_config\\"
  4.2851  
  4.2852 -Copyright (C) 2009 Free Software Foundation, Inc.
  4.2853 +Copyright (C) 2012 Free Software Foundation, Inc.
  4.2854  This config.status script is free software; the Free Software Foundation
  4.2855  gives unlimited permission to copy, distribute and modify it."
  4.2856  
  4.2857 @@ -14144,11 +14173,16 @@
  4.2858  while test $# != 0
  4.2859  do
  4.2860    case $1 in
  4.2861 -  --*=*)
  4.2862 +  --*=?*)
  4.2863      ac_option=`expr "X$1" : 'X\([^=]*\)='`
  4.2864      ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
  4.2865      ac_shift=:
  4.2866      ;;
  4.2867 +  --*=)
  4.2868 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
  4.2869 +    ac_optarg=
  4.2870 +    ac_shift=:
  4.2871 +    ;;
  4.2872    *)
  4.2873      ac_option=$1
  4.2874      ac_optarg=$2
  4.2875 @@ -14170,6 +14204,7 @@
  4.2876      $ac_shift
  4.2877      case $ac_optarg in
  4.2878      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
  4.2879 +    '') as_fn_error $? "missing file argument" ;;
  4.2880      esac
  4.2881      as_fn_append CONFIG_FILES " '$ac_optarg'"
  4.2882      ac_need_defaults=false;;
  4.2883 @@ -14180,7 +14215,7 @@
  4.2884      ac_cs_silent=: ;;
  4.2885  
  4.2886    # This is an error.
  4.2887 -  -*) as_fn_error "unrecognized option: \`$1'
  4.2888 +  -*) as_fn_error $? "unrecognized option: \`$1'
  4.2889  Try \`$0 --help' for more information." ;;
  4.2890  
  4.2891    *) as_fn_append ac_config_targets " $1"
  4.2892 @@ -14200,7 +14235,7 @@
  4.2893  _ACEOF
  4.2894  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4.2895  if \$ac_cs_recheck; then
  4.2896 -  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  4.2897 +  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  4.2898    shift
  4.2899    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
  4.2900    CONFIG_SHELL='$SHELL'
  4.2901 @@ -14496,7 +14531,7 @@
  4.2902      "SDL2_image.spec") CONFIG_FILES="$CONFIG_FILES SDL2_image.spec" ;;
  4.2903      "SDL2_image.pc") CONFIG_FILES="$CONFIG_FILES SDL2_image.pc" ;;
  4.2904  
  4.2905 -  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  4.2906 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  4.2907    esac
  4.2908  done
  4.2909  
  4.2910 @@ -14518,9 +14553,10 @@
  4.2911  # after its creation but before its name has been assigned to `$tmp'.
  4.2912  $debug ||
  4.2913  {
  4.2914 -  tmp=
  4.2915 +  tmp= ac_tmp=
  4.2916    trap 'exit_status=$?
  4.2917 -  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  4.2918 +  : "${ac_tmp:=$tmp}"
  4.2919 +  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  4.2920  ' 0
  4.2921    trap 'as_fn_exit 1' 1 2 13 15
  4.2922  }
  4.2923 @@ -14528,12 +14564,13 @@
  4.2924  
  4.2925  {
  4.2926    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  4.2927 -  test -n "$tmp" && test -d "$tmp"
  4.2928 +  test -d "$tmp"
  4.2929  }  ||
  4.2930  {
  4.2931    tmp=./conf$$-$RANDOM
  4.2932    (umask 077 && mkdir "$tmp")
  4.2933 -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
  4.2934 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  4.2935 +ac_tmp=$tmp
  4.2936  
  4.2937  # Set up the scripts for CONFIG_FILES section.
  4.2938  # No need to generate them if there are no CONFIG_FILES.
  4.2939 @@ -14550,12 +14587,12 @@
  4.2940  fi
  4.2941  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  4.2942  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
  4.2943 -  ac_cs_awk_cr='\r'
  4.2944 +  ac_cs_awk_cr='\\r'
  4.2945  else
  4.2946    ac_cs_awk_cr=$ac_cr
  4.2947  fi
  4.2948  
  4.2949 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
  4.2950 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  4.2951  _ACEOF
  4.2952  
  4.2953  
  4.2954 @@ -14564,18 +14601,18 @@
  4.2955    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
  4.2956    echo "_ACEOF"
  4.2957  } >conf$$subs.sh ||
  4.2958 -  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  4.2959 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  4.2960 +  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  4.2961 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
  4.2962  ac_delim='%!_!# '
  4.2963  for ac_last_try in false false false false false :; do
  4.2964    . ./conf$$subs.sh ||
  4.2965 -    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  4.2966 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  4.2967  
  4.2968    ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
  4.2969    if test $ac_delim_n = $ac_delim_num; then
  4.2970      break
  4.2971    elif $ac_last_try; then
  4.2972 -    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  4.2973 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  4.2974    else
  4.2975      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  4.2976    fi
  4.2977 @@ -14583,7 +14620,7 @@
  4.2978  rm -f conf$$subs.sh
  4.2979  
  4.2980  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4.2981 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  4.2982 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  4.2983  _ACEOF
  4.2984  sed -n '
  4.2985  h
  4.2986 @@ -14631,7 +14668,7 @@
  4.2987  rm -f conf$$subs.awk
  4.2988  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4.2989  _ACAWK
  4.2990 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  4.2991 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  4.2992    for (key in S) S_is_set[key] = 1
  4.2993    FS = ""
  4.2994  
  4.2995 @@ -14663,21 +14700,29 @@
  4.2996    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  4.2997  else
  4.2998    cat
  4.2999 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  4.3000 -  || as_fn_error "could not setup config files machinery" "$LINENO" 5
  4.3001 -_ACEOF
  4.3002 -
  4.3003 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
  4.3004 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  4.3005 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  4.3006 +  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  4.3007 +_ACEOF
  4.3008 +
  4.3009 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
  4.3010 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
  4.3011  # trailing colons and then remove the whole line if VPATH becomes empty
  4.3012  # (actually we leave an empty line to preserve line numbers).
  4.3013  if test "x$srcdir" = x.; then
  4.3014 -  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
  4.3015 -s/:*\$(srcdir):*/:/
  4.3016 -s/:*\${srcdir}:*/:/
  4.3017 -s/:*@srcdir@:*/:/
  4.3018 -s/^\([^=]*=[	 ]*\):*/\1/
  4.3019 +  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
  4.3020 +h
  4.3021 +s///
  4.3022 +s/^/:/
  4.3023 +s/[	 ]*$/:/
  4.3024 +s/:\$(srcdir):/:/g
  4.3025 +s/:\${srcdir}:/:/g
  4.3026 +s/:@srcdir@:/:/g
  4.3027 +s/^:*//
  4.3028  s/:*$//
  4.3029 +x
  4.3030 +s/\(=[	 ]*\).*/\1/
  4.3031 +G
  4.3032 +s/\n//
  4.3033  s/^[^=]*=[	 ]*$//
  4.3034  }'
  4.3035  fi
  4.3036 @@ -14695,7 +14740,7 @@
  4.3037    esac
  4.3038    case $ac_mode$ac_tag in
  4.3039    :[FHL]*:*);;
  4.3040 -  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
  4.3041 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  4.3042    :[FH]-) ac_tag=-:-;;
  4.3043    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  4.3044    esac
  4.3045 @@ -14714,7 +14759,7 @@
  4.3046      for ac_f
  4.3047      do
  4.3048        case $ac_f in
  4.3049 -      -) ac_f="$tmp/stdin";;
  4.3050 +      -) ac_f="$ac_tmp/stdin";;
  4.3051        *) # Look for the file first in the build tree, then in the source tree
  4.3052  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  4.3053  	 # because $ac_f cannot contain `:'.
  4.3054 @@ -14723,7 +14768,7 @@
  4.3055  	   [\\/$]*) false;;
  4.3056  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  4.3057  	   esac ||
  4.3058 -	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  4.3059 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  4.3060        esac
  4.3061        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  4.3062        as_fn_append ac_file_inputs " '$ac_f'"
  4.3063 @@ -14749,8 +14794,8 @@
  4.3064      esac
  4.3065  
  4.3066      case $ac_tag in
  4.3067 -    *:-:* | *:-) cat >"$tmp/stdin" \
  4.3068 -      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
  4.3069 +    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  4.3070 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  4.3071      esac
  4.3072      ;;
  4.3073    esac
  4.3074 @@ -14886,23 +14931,24 @@
  4.3075  s&@MKDIR_P@&$ac_MKDIR_P&;t t
  4.3076  $ac_datarootdir_hack
  4.3077  "
  4.3078 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  4.3079 -  || as_fn_error "could not create $ac_file" "$LINENO" 5
  4.3080 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  4.3081 +  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  4.3082  
  4.3083  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  4.3084 -  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  4.3085 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  4.3086 +  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  4.3087 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  4.3088 +      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  4.3089    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  4.3090 -which seems to be undefined.  Please make sure it is defined." >&5
  4.3091 +which seems to be undefined.  Please make sure it is defined" >&5
  4.3092  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  4.3093 -which seems to be undefined.  Please make sure it is defined." >&2;}
  4.3094 -
  4.3095 -  rm -f "$tmp/stdin"
  4.3096 +which seems to be undefined.  Please make sure it is defined" >&2;}
  4.3097 +
  4.3098 +  rm -f "$ac_tmp/stdin"
  4.3099    case $ac_file in
  4.3100 -  -) cat "$tmp/out" && rm -f "$tmp/out";;
  4.3101 -  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  4.3102 +  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  4.3103 +  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  4.3104    esac \
  4.3105 -  || as_fn_error "could not create $ac_file" "$LINENO" 5
  4.3106 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  4.3107   ;;
  4.3108  
  4.3109  
  4.3110 @@ -15635,11 +15681,11 @@
  4.3111    if test $am_rc -ne 0; then
  4.3112      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  4.3113  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  4.3114 -as_fn_error "Something went wrong bootstrapping makefile fragments
  4.3115 +as_fn_error $? "Something went wrong bootstrapping makefile fragments
  4.3116      for automatic dependency tracking.  Try re-running configure with the
  4.3117      '--disable-dependency-tracking' option to at least be able to build
  4.3118      the package (albeit without support for automatic dependency tracking).
  4.3119 -See \`config.log' for more details." "$LINENO" 5; }
  4.3120 +See \`config.log' for more details" "$LINENO" 5; }
  4.3121    fi
  4.3122    { am_dirpart=; unset am_dirpart;}
  4.3123    { am_filepart=; unset am_filepart;}
  4.3124 @@ -15658,7 +15704,7 @@
  4.3125  ac_clean_files=$ac_clean_files_save
  4.3126  
  4.3127  test $ac_write_fail = 0 ||
  4.3128 -  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
  4.3129 +  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
  4.3130  
  4.3131  
  4.3132  # configure is writing to config.log, and then calls config.status.
  4.3133 @@ -15679,7 +15725,7 @@
  4.3134    exec 5>>config.log
  4.3135    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
  4.3136    # would make configure fail if this is the last instruction.
  4.3137 -  $ac_cs_success || as_fn_exit $?
  4.3138 +  $ac_cs_success || as_fn_exit 1
  4.3139  fi
  4.3140  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
  4.3141    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5