[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.4-1

Guido Günther agx at sigxcpu.org
Tue Aug 9 15:01:28 UTC 2011


The following commit has been merged in the experimental branch:
commit 666173090ff6ff626107afac942e9b23d14f1d91
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Aug 9 15:01:06 2011 +0200

    New patch Readd-LFS-support.patch
    
    Readd LFS support

diff --git a/debian/patches/Autoreconf.patch b/debian/patches/Autoreconf.patch
new file mode 100644
index 0000000..2c726ed
--- /dev/null
+++ b/debian/patches/Autoreconf.patch
@@ -0,0 +1,8053 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Tue, 9 Aug 2011 14:46:21 +0200
+Subject: Autoreconf
+
+---
+ aclocal.m4  |   18 +-
+ config.h.in |    6 +
+ configure   | 1996 +++++++++++++++++++++++++++++++++--------------------------
+ 3 files changed, 1145 insertions(+), 875 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index e30a5e1..01ca3c3 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -13,8 +13,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+-[m4_warning([this file was generated for autoconf 2.66.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -47,7 +47,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
+ # ----------------------------------
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+ AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+ AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+ AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+@@ -93,7 +94,8 @@ m4_define([_PKG_CONFIG],
+     pkg_cv_[]$1="$$1"
+  elif test -n "$PKG_CONFIG"; then
+     PKG_CHECK_EXISTS([$3],
+-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes ],
+ 		     [pkg_failed=yes])
+  else
+     pkg_failed=untried
+@@ -141,9 +143,9 @@ if test $pkg_failed = yes; then
+    	AC_MSG_RESULT([no])
+         _PKG_SHORT_ERRORS_SUPPORTED
+         if test $_pkg_short_errors_supported = yes; then
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+         else 
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+@@ -156,7 +158,7 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT])
++_PKG_TEXT])[]dnl
+         ])
+ elif test $pkg_failed = untried; then
+      	AC_MSG_RESULT([no])
+@@ -167,7 +169,7 @@ path to pkg-config.
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+         ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+diff --git a/config.h.in b/config.h.in
+index e3d4ef7..44f3c26 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -1924,9 +1924,15 @@
+ # endif
+ #endif
+ 
++/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS
++
+ /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+ #undef _LARGEFILE_SOURCE
+ 
++/* Define for large files, on AIX-style hosts. */
++#undef _LARGE_FILES
++
+ /* Define in order to get some macros on AIX systems. */
+ #undef _LINUX_SOURCE_COMPAT
+ 
+diff --git a/configure b/configure
+index 523bbbd..d27d876 100755
+--- a/configure
++++ b/configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.66 for libvirt 0.9.4.
++# Generated by GNU Autoconf 2.68 for libvirt 0.9.4.
+ #
+ # Report bugs to <libvir-list at redhat.com>.
+ #
+@@ -91,6 +91,7 @@ fi
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -224,11 +225,18 @@ IFS=$as_save_IFS
+   # We cannot yet assume a decent shell, so we have to provide a
+ 	# neutralization value for shells without unset; and this also
+ 	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
+ 	BASH_ENV=/dev/null
+ 	ENV=/dev/null
+ 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ 	export CONFIG_SHELL
+-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -1836,6 +1844,7 @@ with_pic
+ enable_fast_install
+ enable_libtool_lock
+ enable_compile_warnings
++enable_largefile
+ with_html_dir
+ with_html_subdir
+ with_xml_catalog_file
+@@ -1998,8 +2007,9 @@ do
+   fi
+ 
+   case $ac_option in
+-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
+   esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -2339,7 +2349,7 @@ Try \`$0 --help' for more information"
+     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+     ;;
+ 
+   esac
+@@ -2572,6 +2582,7 @@ Optional Features:
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-compile-warnings=[no/yes/error]
+                           Turn on compiler warnings
++  --disable-largefile     omit support for large files
+   --enable-debug=[no|yes] enable debugging output [default=yes]
+   --enable-test-coverage  turn on code coverage instrumentation [default=no]
+   --enable-test-oom       memory allocation failure checking [default=no]
+@@ -2793,7 +2804,7 @@ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ libvirt configure 0.9.4
+-generated by GNU Autoconf 2.66
++generated by GNU Autoconf 2.68
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -2839,7 +2850,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_compile
+@@ -2865,7 +2876,7 @@ $as_echo "$ac_try_echo"; } >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then :
+@@ -2876,7 +2887,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+     ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+@@ -2889,10 +2900,10 @@ fi
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if eval "test \"\${$3+set}\"" = set; then :
++  if eval \${$3+:} false; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2928,7 +2939,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+ 
+@@ -2959,7 +2970,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+@@ -2968,7 +2979,7 @@ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_mongrel
+ 
+@@ -3009,7 +3020,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_run
+@@ -3023,7 +3034,7 @@ ac_fn_c_check_header_compile ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3041,7 +3052,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_compile
+ 
+@@ -3086,7 +3097,7 @@ fi
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_link
+@@ -3099,7 +3110,7 @@ ac_fn_c_check_func ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3154,7 +3165,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_func
+ 
+@@ -3167,7 +3178,7 @@ ac_fn_c_check_type ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=no"
+@@ -3208,7 +3219,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_type
+ 
+@@ -3221,7 +3232,7 @@ ac_fn_c_check_member ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+ $as_echo_n "checking for $2.$3... " >&6; }
+-if eval "test \"\${$4+set}\"" = set; then :
++if eval \${$4+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3265,7 +3276,7 @@ fi
+ eval ac_res=\$$4
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_member
+ 
+@@ -3442,7 +3453,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ rm -f conftest.val
+ 
+   fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_compute_int
+@@ -3458,7 +3469,7 @@ ac_fn_c_check_decl ()
+   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+ $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3489,7 +3500,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_decl
+ cat >config.log <<_ACEOF
+@@ -3497,7 +3508,7 @@ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by libvirt $as_me 0.9.4, which was
+-generated by GNU Autoconf 2.66.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -4004,7 +4015,7 @@ am__api_version='1.11'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4181,7 +4192,7 @@ if test "$cross_compiling" != no; then
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -4221,7 +4232,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -4274,7 +4285,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+-  if test "${ac_cv_path_mkdir+set}" = set; then :
++  if ${ac_cv_path_mkdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4326,7 +4337,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then :
++if ${ac_cv_prog_AWK+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -4366,7 +4377,7 @@ done
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -4516,7 +4527,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then :
++if ${ac_cv_build+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_build_alias=$build_alias
+@@ -4550,7 +4561,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then :
++if ${ac_cv_host+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$host_alias" = x; then
+@@ -4655,7 +4666,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4695,7 +4706,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4748,7 +4759,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4788,7 +4799,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4847,7 +4858,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4891,7 +4902,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -5174,7 +5185,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5225,7 +5236,7 @@ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5262,7 +5273,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -5340,7 +5351,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -5501,7 +5512,7 @@ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5637,7 +5648,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5667,7 +5678,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -5683,11 +5694,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+   break
+ fi
+@@ -5726,7 +5737,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -5742,11 +5753,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ 
+ else
+@@ -5772,7 +5783,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5812,7 +5823,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -5865,7 +5876,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5905,7 +5916,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5964,7 +5975,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -6008,7 +6019,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -6092,7 +6103,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6129,7 +6140,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -6207,7 +6218,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -6306,7 +6317,7 @@ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -6438,7 +6449,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -6478,7 +6489,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -6534,7 +6545,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6655,7 +6666,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -6718,7 +6729,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -6785,7 +6796,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6916,7 +6927,7 @@ done
+ 
+ 
+   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
++if test "x$ac_cv_header_minix_config_h" = xyes; then :
+   MINIX=yes
+ else
+   MINIX=
+@@ -6946,7 +6957,7 @@ $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+ $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
++if ${ac_cv_safe_to_define___extensions__+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6993,7 +7004,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+-if test "${ac_cv_sys_largefile_source+set}" = set; then :
++if ${ac_cv_sys_largefile_source+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+@@ -7092,7 +7103,7 @@ fi
+   *) :
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+ $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+-if test "${ac_cv_prog_cc_c99+set}" = set; then :
++if ${ac_cv_prog_cc_c99+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c99=no
+@@ -7267,7 +7278,7 @@ if test "x$ac_cv_prog_cc_c99" != xno; then :
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -7363,7 +7374,7 @@ fi
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
+ $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
+-  if test "${ac_cv_prog_cc_stdc+set}" = set; then :
++  if ${ac_cv_prog_cc_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ 
+@@ -7824,7 +7835,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
+-if test "${ac_cv_c_inline+set}" = set; then :
++if ${ac_cv_c_inline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_inline=no
+@@ -7896,7 +7907,7 @@ done
+                          for ac_header in ws2tcpip.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+-if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then :
++if test "x$ac_cv_header_ws2tcpip_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WS2TCPIP_H 1
+ _ACEOF
+@@ -7911,7 +7922,7 @@ done
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+ $as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
+-if test "${gl_cv_have_include_next+set}" = set; then :
++if ${gl_cv_have_include_next+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -rf conftestd1a conftestd1b conftestd2
+@@ -7991,7 +8002,7 @@ $as_echo "$gl_cv_have_include_next" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
+ $as_echo_n "checking whether system header files limit the line length... " >&6; }
+-if test "${gl_cv_pragma_columns+set}" = set; then :
++if ${gl_cv_pragma_columns+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8156,7 +8167,7 @@ $as_echo "#define _POSIX_PII_SOCKET 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> is self-contained" >&5
+ $as_echo_n "checking whether <sys/socket.h> is self-contained... " >&6; }
+-if test "${gl_cv_header_sys_socket_h_selfcontained+set}" = set; then :
++if ${gl_cv_header_sys_socket_h_selfcontained+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -8185,7 +8196,7 @@ $as_echo "$gl_cv_header_sys_socket_h_selfcontained" >&6; }
+             for ac_func in shutdown
+ do :
+   ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
+-if test "x$ac_cv_func_shutdown" = x""yes; then :
++if test "x$ac_cv_func_shutdown" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SHUTDOWN 1
+ _ACEOF
+@@ -8196,7 +8207,7 @@ done
+     if test $ac_cv_func_shutdown = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> defines the SHUT_* macros" >&5
+ $as_echo_n "checking whether <sys/socket.h> defines the SHUT_* macros... " >&6; }
+-if test "${gl_cv_header_sys_socket_h_shut+set}" = set; then :
++if ${gl_cv_header_sys_socket_h_shut+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -8249,7 +8260,7 @@ $as_echo "$gl_cv_header_sys_socket_h_shut" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/socket.h>" >&5
+ $as_echo_n "checking absolute name of <sys/socket.h>... " >&6; }
+-if test "${gl_cv_next_sys_socket_h+set}" = set; then :
++if ${gl_cv_next_sys_socket_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -8322,7 +8333,7 @@ $as_echo "$gl_cv_next_sys_socket_h" >&6; }
+ #endif
+ 
+ "
+-if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
++if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_STORAGE 1
+@@ -8343,7 +8354,7 @@ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "
+ #endif
+ 
+ "
+-if test "x$ac_cv_type_sa_family_t" = x""yes; then :
++if test "x$ac_cv_type_sa_family_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SA_FAMILY_T 1
+@@ -8368,7 +8379,7 @@ fi
+        #endif
+ 
+ "
+-if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+@@ -8398,7 +8409,7 @@ fi
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -8420,11 +8431,22 @@ done
+ 
+ 
+ 
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = xyes; then :
++
++else
++
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
++_ACEOF
++
++fi
++
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+ $as_echo_n "checking for working alloca.h... " >&6; }
+-if test "${ac_cv_working_alloca_h+set}" = set; then :
++if ${ac_cv_working_alloca_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8457,7 +8479,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+ $as_echo_n "checking for alloca... " >&6; }
+-if test "${ac_cv_func_alloca_works+set}" = set; then :
++if ${ac_cv_func_alloca_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8476,7 +8498,7 @@ else
+  #pragma alloca
+ #   else
+ #    ifndef alloca /* predefined by HP cc +Olibcalls */
+-char *alloca ();
++void *alloca (size_t);
+ #    endif
+ #   endif
+ #  endif
+@@ -8524,7 +8546,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+ $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+-if test "${ac_cv_os_cray+set}" = set; then :
++if ${ac_cv_os_cray+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8565,7 +8587,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+ $as_echo_n "checking stack direction for C alloca... " >&6; }
+-if test "${ac_cv_c_stack_direction+set}" = set; then :
++if ${ac_cv_c_stack_direction+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -8643,7 +8665,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+ $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+-if test "${ac_cv_c_restrict+set}" = set; then :
++if ${ac_cv_c_restrict+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_restrict=no
+@@ -8757,7 +8779,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc are POSIX compliant" >&5
+ $as_echo_n "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; }
+-if test "${gl_cv_func_malloc_posix+set}" = set; then :
++if ${gl_cv_func_malloc_posix+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -8820,7 +8842,7 @@ done
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+ $as_echo_n "checking whether // is distinct from /... " >&6; }
+-if test "${gl_cv_double_slash_root+set}" = set; then :
++if ${gl_cv_double_slash_root+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+    if test x"$cross_compiling" = xyes ; then
+@@ -8870,7 +8892,7 @@ $as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+ $as_echo_n "checking whether realpath works... " >&6; }
+-if test "${gl_cv_func_realpath_works+set}" = set; then :
++if ${gl_cv_func_realpath_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9061,7 +9083,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+ $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+-if test "${ac_cv_type_uid_t+set}" = set; then :
++if ${ac_cv_type_uid_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -9092,7 +9114,7 @@ fi
+ for ac_header in unistd.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+-if test "x$ac_cv_header_unistd_h" = x""yes; then :
++if test "x$ac_cv_header_unistd_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_UNISTD_H 1
+ _ACEOF
+@@ -9103,7 +9125,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5
+ $as_echo_n "checking for working chown... " >&6; }
+-if test "${ac_cv_func_chown_works+set}" = set; then :
++if ${ac_cv_func_chown_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -9157,7 +9179,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether chown dereferences symlinks" >&5
+ $as_echo_n "checking whether chown dereferences symlinks... " >&6; }
+-if test "${gl_cv_func_chown_follows_symlink+set}" = set; then :
++if ${gl_cv_func_chown_follows_symlink+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9255,7 +9277,7 @@ $as_echo "#define CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE 1" >>confdefs.h
+ 
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether chown honors trailing slash" >&5
+ $as_echo_n "checking whether chown honors trailing slash... " >&6; }
+-if test "${gl_cv_func_chown_slash_works+set}" = set; then :
++if ${gl_cv_func_chown_slash_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   touch conftest.file && rm -f conftest.link
+@@ -9301,7 +9323,7 @@ $as_echo "#define CHOWN_TRAILING_SLASH_BUG 1" >>confdefs.h
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether chown always updates ctime" >&5
+ $as_echo_n "checking whether chown always updates ctime... " >&6; }
+-if test "${gl_cv_func_chown_ctime_works+set}" = set; then :
++if ${gl_cv_func_chown_ctime_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -9355,7 +9377,7 @@ $as_echo "#define CHOWN_CHANGE_TIME_BUG 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
+ $as_echo_n "checking for unsigned long long int... " >&6; }
+-if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
++if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -9412,7 +9434,7 @@ $as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+ 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if test "${ac_cv_c_bigendian+set}" = set; then :
++if ${ac_cv_c_bigendian+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_bigendian=unknown
+@@ -9642,7 +9664,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+ $as_echo_n "checking if environ is properly declared... " >&6; }
+-  if test "${gt_cv_var_environ_declaration+set}" = set; then :
++  if ${gt_cv_var_environ_declaration+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9683,7 +9705,7 @@ $as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+ $as_echo_n "checking for complete errno.h... " >&6; }
+-if test "${gl_cv_header_errno_h_complete+set}" = set; then :
++if ${gl_cv_header_errno_h_complete+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9754,7 +9776,7 @@ $as_echo "$gl_cv_header_errno_h_complete" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+ $as_echo_n "checking absolute name of <errno.h>... " >&6; }
+-if test "${gl_cv_next_errno_h+set}" = set; then :
++if ${gl_cv_next_errno_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9809,7 +9831,7 @@ fi
+   if test -n "$ERRNO_H"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+ $as_echo_n "checking for EMULTIHOP value... " >&6; }
+-if test "${gl_cv_header_errno_h_EMULTIHOP+set}" = set; then :
++if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9880,7 +9902,7 @@ $as_echo "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+   if test -n "$ERRNO_H"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+ $as_echo_n "checking for ENOLINK value... " >&6; }
+-if test "${gl_cv_header_errno_h_ENOLINK+set}" = set; then :
++if ${gl_cv_header_errno_h_ENOLINK+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -9951,7 +9973,7 @@ $as_echo "$gl_cv_header_errno_h_ENOLINK" >&6; }
+   if test -n "$ERRNO_H"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+ $as_echo_n "checking for EOVERFLOW value... " >&6; }
+-if test "${gl_cv_header_errno_h_EOVERFLOW+set}" = set; then :
++if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10138,7 +10160,7 @@ $as_echo "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+ $as_echo_n "checking for working fcntl.h... " >&6; }
+-if test "${gl_cv_header_working_fcntl_h+set}" = set; then :
++if ${gl_cv_header_working_fcntl_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -10273,7 +10295,7 @@ _ACEOF
+ 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+ $as_echo_n "checking for mbstate_t... " >&6; }
+-if test "${ac_cv_type_mbstate_t+set}" = set; then :
++if ${ac_cv_type_mbstate_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10377,7 +10399,7 @@ $as_echo "#define mbstate_t int" >>confdefs.h
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdin defaults to large file offsets" >&5
+ $as_echo_n "checking whether stdin defaults to large file offsets... " >&6; }
+-if test "${gl_cv_var_stdin_large_offset+set}" = set; then :
++if ${gl_cv_var_stdin_large_offset+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10412,7 +10434,7 @@ $as_echo "$gl_cv_var_stdin_large_offset" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "fseeko" "ac_cv_have_decl_fseeko" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_fseeko" = x""yes; then :
++if test "x$ac_cv_have_decl_fseeko" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -10432,7 +10454,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5
+ $as_echo_n "checking for fseeko... " >&6; }
+-if test "${gl_cv_func_fseeko+set}" = set; then :
++if ${gl_cv_func_fseeko+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10481,7 +10503,7 @@ $as_echo "$gl_cv_func_fseeko" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5
+ $as_echo_n "checking whether fflush works on input streams... " >&6; }
+-if test "${gl_cv_func_fflush_stdin+set}" = set; then :
++if ${gl_cv_func_fflush_stdin+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   echo hello world > conftest.txt
+@@ -10560,7 +10582,7 @@ $as_echo "$gl_cv_func_fflush_stdin" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_ftello" = x""yes; then :
++if test "x$ac_cv_have_decl_ftello" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -10591,7 +10613,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5
+ $as_echo_n "checking for ftello... " >&6; }
+-if test "${gl_cv_func_ftello+set}" = set; then :
++if ${gl_cv_func_ftello+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10626,7 +10648,7 @@ $as_echo "$gl_cv_func_ftello" >&6; }
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5
+ $as_echo_n "checking whether ftello works... " >&6; }
+-if test "${gl_cv_func_ftello_works+set}" = set; then :
++if ${gl_cv_func_ftello_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10761,7 +10783,7 @@ $as_echo "#define FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE 1" >>confdefs
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <netdb.h>" >&5
+ $as_echo_n "checking absolute name of <netdb.h>... " >&6; }
+-if test "${gl_cv_next_netdb_h+set}" = set; then :
++if ${gl_cv_next_netdb_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10821,7 +10843,7 @@ $as_echo "$gl_cv_next_netdb_h" >&6; }
+   gl_saved_libs="$LIBS"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+ $as_echo_n "checking for library containing gethostbyname... " >&6; }
+-if test "${ac_cv_search_gethostbyname+set}" = set; then :
++if ${ac_cv_search_gethostbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -10855,11 +10877,11 @@ for ac_lib in '' nsl network net; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_gethostbyname+set}" = set; then :
++  if ${ac_cv_search_gethostbyname+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_gethostbyname+set}" = set; then :
++if ${ac_cv_search_gethostbyname+:} false; then :
+ 
+ else
+   ac_cv_search_gethostbyname=no
+@@ -10882,7 +10904,7 @@ fi
+     for ac_func in gethostbyname
+ do :
+   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++if test "x$ac_cv_func_gethostbyname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME 1
+ _ACEOF
+@@ -10891,7 +10913,7 @@ else
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_w32_gethostbyname+set}" = set; then :
++if ${gl_cv_w32_gethostbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_w32_gethostbyname=no
+@@ -10938,7 +10960,7 @@ done
+   gl_saved_libs="$LIBS"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getservbyname" >&5
+ $as_echo_n "checking for library containing getservbyname... " >&6; }
+-if test "${ac_cv_search_getservbyname+set}" = set; then :
++if ${ac_cv_search_getservbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -10972,11 +10994,11 @@ for ac_lib in '' socket network net; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_getservbyname+set}" = set; then :
++  if ${ac_cv_search_getservbyname+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_getservbyname+set}" = set; then :
++if ${ac_cv_search_getservbyname+:} false; then :
+ 
+ else
+   ac_cv_search_getservbyname=no
+@@ -10999,7 +11021,7 @@ fi
+     for ac_func in getservbyname
+ do :
+   ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname"
+-if test "x$ac_cv_func_getservbyname" = x""yes; then :
++if test "x$ac_cv_func_getservbyname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETSERVBYNAME 1
+ _ACEOF
+@@ -11008,7 +11030,7 @@ else
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking for getservbyname in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_w32_getservbyname+set}" = set; then :
++if ${gl_cv_w32_getservbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_w32_getservbyname=no
+@@ -11057,7 +11079,7 @@ done
+   gl_save_LIBS=$LIBS
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5
+ $as_echo_n "checking for library containing inet_ntop... " >&6; }
+-if test "${ac_cv_search_inet_ntop+set}" = set; then :
++if ${ac_cv_search_inet_ntop+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -11091,11 +11113,11 @@ for ac_lib in '' nsl; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_inet_ntop+set}" = set; then :
++  if ${ac_cv_search_inet_ntop+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_inet_ntop+set}" = set; then :
++if ${ac_cv_search_inet_ntop+:} false; then :
+ 
+ else
+   ac_cv_search_inet_ntop=no
+@@ -11113,7 +11135,7 @@ else
+   for ac_func in inet_ntop
+ do :
+   ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+-if test "x$ac_cv_func_inet_ntop" = x""yes; then :
++if test "x$ac_cv_func_inet_ntop" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_INET_NTOP 1
+ _ACEOF
+@@ -11149,7 +11171,7 @@ fi
+      #endif
+ 
+ "
+-if test "x$ac_cv_have_decl_inet_ntop" = x""yes; then :
++if test "x$ac_cv_have_decl_inet_ntop" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11181,7 +11203,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv4 sockets" >&5
+ $as_echo_n "checking for IPv4 sockets... " >&6; }
+-  if test "${gl_cv_socket_ipv4+set}" = set; then :
++  if ${gl_cv_socket_ipv4+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -11223,7 +11245,7 @@ $as_echo "#define HAVE_IPV4 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 sockets" >&5
+ $as_echo_n "checking for IPv6 sockets... " >&6; }
+-  if test "${gl_cv_socket_ipv6+set}" = set; then :
++  if ${gl_cv_socket_ipv6+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -11269,7 +11291,7 @@ $as_echo "#define HAVE_IPV6 1" >>confdefs.h
+ 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5
+ $as_echo_n "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; }
+-if test "${gl_cv_func_getcwd_null+set}" = set; then :
++if ${gl_cv_func_getcwd_null+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -11337,7 +11359,7 @@ $as_echo "$gl_cv_func_getcwd_null" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_getdelim" = x""yes; then :
++if test "x$ac_cv_have_decl_getdelim" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11360,7 +11382,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_getline" = x""yes; then :
++if test "x$ac_cv_have_decl_getline" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11373,7 +11395,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "getpass" "ac_cv_have_decl_getpass" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_getpass" = x""yes; then :
++if test "x$ac_cv_have_decl_getpass" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11411,7 +11433,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_fflush_unlocked" = x""yes; then :
++if test "x$ac_cv_have_decl_fflush_unlocked" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11424,7 +11446,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "flockfile" "ac_cv_have_decl_flockfile" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_flockfile" = x""yes; then :
++if test "x$ac_cv_have_decl_flockfile" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11437,7 +11459,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_fputs_unlocked" = x""yes; then :
++if test "x$ac_cv_have_decl_fputs_unlocked" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11450,7 +11472,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "funlockfile" "ac_cv_have_decl_funlockfile" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_funlockfile" = x""yes; then :
++if test "x$ac_cv_have_decl_funlockfile" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11463,7 +11485,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_putc_unlocked" = x""yes; then :
++if test "x$ac_cv_have_decl_putc_unlocked" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11516,7 +11538,7 @@ _ACEOF
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/time.h>" >&5
+ $as_echo_n "checking absolute name of <sys/time.h>... " >&6; }
+-if test "${gl_cv_next_sys_time_h+set}" = set; then :
++if ${gl_cv_next_sys_time_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -11569,7 +11591,7 @@ $as_echo "$gl_cv_next_sys_time_h" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
+ $as_echo_n "checking for struct timeval... " >&6; }
+-if test "${gl_cv_sys_struct_timeval+set}" = set; then :
++if ${gl_cv_sys_struct_timeval+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -11613,7 +11635,7 @@ $as_echo "$gl_cv_sys_struct_timeval" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+ $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+-if test "${am_cv_langinfo_codeset+set}" = set; then :
++if ${am_cv_langinfo_codeset+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -11646,7 +11668,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
++if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -11660,7 +11682,7 @@ _ACEOF
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+ $as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+-if test "${ac_cv_gnu_library_2_1+set}" = set; then :
++if ${ac_cv_gnu_library_2_1+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -11807,7 +11829,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${acl_cv_path_LD+set}" = set; then :
++if ${acl_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -11844,7 +11866,7 @@ fi
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
++if ${acl_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+@@ -11864,7 +11886,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
+ 
+                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+ $as_echo_n "checking for shared library run path origin... " >&6; }
+-if test "${acl_cv_rpath+set}" = set; then :
++if ${acl_cv_rpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -11947,7 +11969,7 @@ $as_echo "$gl_have_weak" >&6; }
+       # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+       # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
+       ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+-if test "x$ac_cv_header_pthread_h" = x""yes; then :
++if test "x$ac_cv_header_pthread_h" = xyes; then :
+   gl_have_pthread_h=yes
+ else
+   gl_have_pthread_h=no
+@@ -11986,7 +12008,7 @@ rm -f core conftest.err conftest.$ac_objext \
+           # need to link with libpthread in order to create multiple threads.
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+ $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
++if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -12020,7 +12042,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
++if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+   LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+              # On Solaris and HP-UX, most pthread functions exist also in libc.
+              # Therefore pthread_in_use() needs to actually try to create a
+@@ -12039,7 +12061,7 @@ fi
+           # Some library is needed. Try libpthread and libc_r.
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+ $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
++if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -12073,7 +12095,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
++if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+   gl_have_pthread=yes
+              LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+              LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+@@ -12083,7 +12105,7 @@ fi
+             # For FreeBSD 4.
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
+ $as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
+-if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then :
++if ${ac_cv_lib_c_r_pthread_kill+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -12117,7 +12139,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
+ $as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
+-if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then :
++if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then :
+   gl_have_pthread=yes
+                LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+                LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
+@@ -12143,7 +12165,7 @@ $as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
+           # pthread_rwlock_* functions.
+           ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
+ "
+-if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then :
++if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+ 
+ $as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
+ 
+@@ -12226,7 +12248,7 @@ $as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
+ $as_echo_n "checking how to link with libpth... " >&6; }
+-if test "${ac_cv_libpth_libs+set}" = set; then :
++if ${ac_cv_libpth_libs+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -12815,7 +12837,7 @@ $as_echo "$gl_threads_api" >&6; }
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+ $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+-if test "${gl_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
++if ${gl_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f conftest.sym conftest.file
+@@ -12874,7 +12896,7 @@ _ACEOF
+   for ac_header in stdlib.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
++if test "x$ac_cv_header_stdlib_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STDLIB_H 1
+ _ACEOF
+@@ -12885,7 +12907,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+ $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
++if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -12934,7 +12956,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
+ $as_echo_n "checking for long long int... " >&6; }
+-if test "${ac_cv_type_long_long_int+set}" = set; then :
++if ${ac_cv_type_long_long_int+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13133,7 +13155,7 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+ $as_echo_n "checking for a traditional japanese locale... " >&6; }
+-if test "${gt_cv_locale_ja+set}" = set; then :
++if ${gt_cv_locale_ja+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -13271,7 +13293,7 @@ $as_echo "$gt_cv_locale_ja" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+ $as_echo_n "checking for a transitional chinese locale... " >&6; }
+-if test "${gt_cv_locale_zh_CN+set}" = set; then :
++if ${gt_cv_locale_zh_CN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -13403,7 +13425,7 @@ $as_echo "$gt_cv_locale_zh_CN" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -13530,7 +13552,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -13751,7 +13773,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+   # irrelevant for anonymous mappings.
+   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+-if test "x$ac_cv_func_mmap" = x""yes; then :
++if test "x$ac_cv_func_mmap" = xyes; then :
+   gl_have_mmap=yes
+ else
+   gl_have_mmap=no
+@@ -13834,7 +13856,7 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+     # Assume that memchr works on platforms that lack mprotect.
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
+ $as_echo_n "checking whether memchr works... " >&6; }
+-if test "${gl_cv_func_memchr_works+set}" = set; then :
++if ${gl_cv_func_memchr_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -14003,7 +14025,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+ $as_echo_n "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
+-if test "${gl_cv_prog_as_underscore+set}" = set; then :
++if ${gl_cv_prog_as_underscore+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.c <<EOF
+@@ -14043,7 +14065,7 @@ _ACEOF
+ 
+ 
+ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+-if test "x$ac_cv_type_mode_t" = x""yes; then :
++if test "x$ac_cv_type_mode_t" = xyes; then :
+ 
+ else
+ 
+@@ -14057,7 +14079,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+ $as_echo_n "checking for promoted mode_t type... " >&6; }
+-if test "${gl_cv_promoted_mode_t+set}" = set; then :
++if ${gl_cv_promoted_mode_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -14107,7 +14129,7 @@ _ACEOF
+   REPLACE_STRERROR_0=0
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
+ $as_echo_n "checking whether strerror(0) succeeds... " >&6; }
+-if test "${gl_cv_func_strerror_0_works+set}" = set; then :
++if ${gl_cv_func_strerror_0_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -14179,7 +14201,7 @@ $as_echo "#define REPLACE_STRERROR_0 1" >>confdefs.h
+     if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror_r with POSIX signature" >&5
+ $as_echo_n "checking for strerror_r with POSIX signature... " >&6; }
+-if test "${gl_cv_func_strerror_r_posix_signature+set}" = set; then :
++if ${gl_cv_func_strerror_r_posix_signature+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -14208,7 +14230,7 @@ $as_echo "$gl_cv_func_strerror_r_posix_signature" >&6; }
+       if test $gl_cv_func_strerror_r_posix_signature = yes; then
+                                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r works" >&5
+ $as_echo_n "checking whether strerror_r works... " >&6; }
+-if test "${gl_cv_func_strerror_r_works+set}" = set; then :
++if ${gl_cv_func_strerror_r_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -14285,7 +14307,7 @@ $as_echo "$gl_cv_func_strerror_r_works" >&6; }
+                         if test $ac_cv_func___xpg_strerror_r = yes; then
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __xpg_strerror_r works" >&5
+ $as_echo_n "checking whether __xpg_strerror_r works... " >&6; }
+-if test "${gl_cv_func_strerror_r_works+set}" = set; then :
++if ${gl_cv_func_strerror_r_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -14343,7 +14365,7 @@ $as_echo "$gl_cv_func_strerror_r_works" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_strerror_r" = x""yes; then :
++if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -14387,7 +14409,7 @@ _ACEOF
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for external symbol _system_configuration" >&5
+ $as_echo_n "checking for external symbol _system_configuration... " >&6; }
+-if test "${gl_cv_var__system_configuration+set}" = set; then :
++if ${gl_cv_var__system_configuration+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -14478,7 +14500,7 @@ $as_echo "#define HAVE__SYSTEM_CONFIGURATION 1" >>confdefs.h
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <poll.h>" >&5
+ $as_echo_n "checking absolute name of <poll.h>... " >&6; }
+-if test "${gl_cv_next_poll_h+set}" = set; then :
++if ${gl_cv_next_poll_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -14591,7 +14613,7 @@ $as_echo "$gl_cv_next_poll_h" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/select.h> is self-contained" >&5
+ $as_echo_n "checking whether <sys/select.h> is self-contained... " >&6; }
+-if test "${gl_cv_header_sys_select_h_selfcontained+set}" = set; then :
++if ${gl_cv_header_sys_select_h_selfcontained+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -14690,7 +14712,7 @@ $as_echo "$gl_cv_header_sys_select_h_selfcontained" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/select.h>" >&5
+ $as_echo_n "checking absolute name of <sys/select.h>... " >&6; }
+-if test "${gl_cv_next_sys_select_h+set}" = set; then :
++if ${gl_cv_next_sys_select_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -14756,7 +14778,7 @@ $as_echo "$gl_cv_next_sys_select_h" >&6; }
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -14793,7 +14815,7 @@ done
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -14815,7 +14837,7 @@ done
+   if test $HAVE_WINSOCK2_H = 1; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to call WSAStartup in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking if we need to call WSAStartup in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_func_wsastartup+set}" = set; then :
++if ${gl_cv_func_wsastartup+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -14860,7 +14882,7 @@ $as_echo "#define WINDOWS_SOCKETS 1" >>confdefs.h
+   else
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5
+ $as_echo_n "checking for library containing setsockopt... " >&6; }
+-if test "${gl_cv_lib_socket+set}" = set; then :
++if ${gl_cv_lib_socket+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -15001,7 +15023,7 @@ $as_echo "$gl_cv_lib_socket" >&6; }
+       #include <sys/types.h>
+ 
+ "
+-if test "x$ac_cv_type_sigset_t" = x""yes; then :
++if test "x$ac_cv_type_sigset_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SIGSET_T 1
+@@ -15020,7 +15042,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+ $as_echo_n "checking for SIGPIPE... " >&6; }
+-if test "${gl_cv_header_signal_h_SIGPIPE+set}" = set; then :
++if ${gl_cv_header_signal_h_SIGPIPE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -15055,7 +15077,7 @@ $as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5
+ $as_echo_n "checking whether snprintf returns a byte count as in C99... " >&6; }
+-if test "${gl_cv_func_snprintf_retval_c99+set}" = set; then :
++if ${gl_cv_func_snprintf_retval_c99+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -15125,7 +15147,7 @@ $as_echo "$gl_cv_func_snprintf_retval_c99" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
++if test "x$ac_cv_have_decl_snprintf" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -15138,7 +15160,7 @@ _ACEOF
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+ $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+-if test "${ac_cv_header_stdbool_h+set}" = set; then :
++if ${ac_cv_header_stdbool_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -15213,7 +15235,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+ $as_echo "$ac_cv_header_stdbool_h" >&6; }
+    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+-if test "x$ac_cv_type__Bool" = x""yes; then :
++if test "x$ac_cv_type__Bool" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE__BOOL 1
+@@ -15230,7 +15252,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+ $as_echo_n "checking for wchar_t... " >&6; }
+-if test "${gt_cv_c_wchar_t+set}" = set; then :
++if ${gt_cv_c_wchar_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -15335,7 +15357,7 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+ $as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+-if test "${gl_cv_next_stdint_h+set}" = set; then :
++if ${gl_cv_next_stdint_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -15391,7 +15413,7 @@ $as_echo "$gl_cv_next_stdint_h" >&6; }
+     if test $ac_cv_header_stdint_h = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+ $as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+-if test "${gl_cv_header_working_stdint_h+set}" = set; then :
++if ${gl_cv_header_working_stdint_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_header_working_stdint_h=no
+@@ -15694,7 +15716,7 @@ done
+   for gltype in ptrdiff_t size_t ; do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+ $as_echo_n "checking for bit size of $gltype... " >&6; }
+-if eval "test \"\${gl_cv_bitsizeof_${gltype}+set}\"" = set; then :
++if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+@@ -15739,7 +15761,7 @@ _ACEOF
+   for gltype in sig_atomic_t wchar_t wint_t ; do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+ $as_echo_n "checking for bit size of $gltype... " >&6; }
+-if eval "test \"\${gl_cv_bitsizeof_${gltype}+set}\"" = set; then :
++if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+@@ -15783,7 +15805,7 @@ _ACEOF
+   for gltype in sig_atomic_t wchar_t wint_t ; do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+ $as_echo_n "checking whether $gltype is signed... " >&6; }
+-if eval "test \"\${gl_cv_type_${gltype}_signed+set}\"" = set; then :
++if eval \${gl_cv_type_${gltype}_signed+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -15842,7 +15864,7 @@ _ACEOF
+   for gltype in ptrdiff_t size_t ; do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+ $as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+-if eval "test \"\${gl_cv_type_${gltype}_suffix+set}\"" = set; then :
++if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval gl_cv_type_${gltype}_suffix=no
+@@ -15914,7 +15936,7 @@ _ACEOF
+   for gltype in sig_atomic_t wchar_t wint_t ; do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+ $as_echo_n "checking for $gltype integer literal suffix... " >&6; }
+-if eval "test \"\${gl_cv_type_${gltype}_suffix+set}\"" = set; then :
++if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval gl_cv_type_${gltype}_suffix=no
+@@ -16000,7 +16022,7 @@ fi
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_strdup" = x""yes; then :
++if test "x$ac_cv_have_decl_strdup" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -16032,7 +16054,7 @@ _ACEOF
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+ $as_echo_n "checking absolute name of <string.h>... " >&6; }
+-if test "${gl_cv_next_string_h+set}" = set; then :
++if ${gl_cv_next_string_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -16102,7 +16124,7 @@ $as_echo "$gl_cv_next_string_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <strings.h>" >&5
+ $as_echo_n "checking absolute name of <strings.h>... " >&6; }
+-if test "${gl_cv_next_strings_h+set}" = set; then :
++if ${gl_cv_next_strings_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -16153,7 +16175,7 @@ $as_echo "$gl_cv_next_strings_h" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_strndup" = x""yes; then :
++if test "x$ac_cv_have_decl_strndup" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -16171,7 +16193,7 @@ _ACEOF
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_strnlen" = x""yes; then :
++if test "x$ac_cv_have_decl_strnlen" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -16190,7 +16212,7 @@ _ACEOF
+ 
+  ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
+ "
+-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
++if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+ 
+ $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
+ 
+@@ -16199,7 +16221,7 @@ fi
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_strtok_r" = x""yes; then :
++if test "x$ac_cv_have_decl_strtok_r" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -16212,7 +16234,7 @@ _ACEOF
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+-if test "${ac_cv_header_stat_broken+set}" = set; then :
++if ${ac_cv_header_stat_broken+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -16297,7 +16319,7 @@ fi
+   if test "$gl_use_threads" != no; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
+ $as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
+-if test "${gl_cv_have_weak+set}" = set; then :
++if ${gl_cv_have_weak+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_have_weak=no
+@@ -16365,7 +16387,7 @@ $as_echo "$gl_cv_have_weak" >&6; }
+       # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+       # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
+       ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+-if test "x$ac_cv_header_pthread_h" = x""yes; then :
++if test "x$ac_cv_header_pthread_h" = xyes; then :
+   gl_have_pthread_h=yes
+ else
+   gl_have_pthread_h=no
+@@ -16404,7 +16426,7 @@ rm -f core conftest.err conftest.$ac_objext \
+           # need to link with libpthread in order to create multiple threads.
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+ $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
++if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16438,7 +16460,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
++if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+   LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+              # On Solaris and HP-UX, most pthread functions exist also in libc.
+              # Therefore pthread_in_use() needs to actually try to create a
+@@ -16457,7 +16479,7 @@ fi
+           # Some library is needed. Try libpthread and libc_r.
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+ $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
++if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16491,7 +16513,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
++if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+   gl_have_pthread=yes
+              LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+              LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+@@ -16501,7 +16523,7 @@ fi
+             # For FreeBSD 4.
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
+ $as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
+-if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then :
++if ${ac_cv_lib_c_r_pthread_kill+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16535,7 +16557,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
+ $as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
+-if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then :
++if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then :
+   gl_have_pthread=yes
+                LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+                LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
+@@ -16613,7 +16635,7 @@ $as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
+ $as_echo_n "checking how to link with libpth... " >&6; }
+-if test "${ac_cv_libpth_libs+set}" = set; then :
++if ${ac_cv_libpth_libs+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -17170,7 +17192,7 @@ $as_echo "$gl_threads_api" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+ $as_echo_n "checking for struct timespec in <time.h>... " >&6; }
+-if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then :
++if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17203,7 +17225,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+ $as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
+-if test "${gl_cv_sys_struct_timespec_in_sys_time_h+set}" = set; then :
++if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17232,7 +17254,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+ $as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
+-if test "${gl_cv_sys_struct_timespec_in_pthread_h+set}" = set; then :
++if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17281,7 +17303,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+ $as_echo_n "checking absolute name of <time.h>... " >&6; }
+-if test "${gl_cv_next_time_h+set}" = set; then :
++if ${gl_cv_next_time_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -17325,7 +17347,7 @@ $as_echo "$gl_cv_next_time_h" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_localtime_r" = x""yes; then :
++if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -17359,7 +17381,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+ $as_echo_n "checking for wint_t... " >&6; }
+-if test "${gt_cv_c_wint_t+set}" = set; then :
++if ${gt_cv_c_wint_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17397,21 +17419,10 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h
+ 
+   fi
+ 
+-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+-if test "x$ac_cv_type_size_t" = x""yes; then :
+-
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
+-_ACEOF
+-
+-fi
+-
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+ $as_echo_n "checking for inttypes.h... " >&6; }
+-if test "${gl_cv_header_inttypes_h+set}" = set; then :
++if ${gl_cv_header_inttypes_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17446,7 +17457,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
+ $as_echo_n "checking for stdint.h... " >&6; }
+-if test "${gl_cv_header_stdint_h+set}" = set; then :
++if ${gl_cv_header_stdint_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17483,7 +17494,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
+ $as_echo_n "checking for intmax_t... " >&6; }
+-if test "${gt_cv_c_intmax_t+set}" = set; then :
++if ${gt_cv_c_intmax_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17551,7 +17562,7 @@ done
+ 
+       ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h>
+ "
+-if test "x$ac_cv_have_decl__snprintf" = x""yes; then :
++if test "x$ac_cv_have_decl__snprintf" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -17575,7 +17586,7 @@ $as_echo "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
++if test "x$ac_cv_have_decl_vsnprintf" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -17589,7 +17600,7 @@ _ACEOF
+ 
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+ $as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
+-if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then :
++if ${gl_cv_header_wchar_h_correct_inline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_header_wchar_h_correct_inline=yes
+@@ -17682,7 +17693,7 @@ Configuration aborted." "$LINENO" 5
+ 
+ 
+ ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_strerror_r" = x""yes; then :
++if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -17695,7 +17706,7 @@ _ACEOF
+ for ac_func in strerror_r
+ do :
+   ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
+-if test "x$ac_cv_func_strerror_r" = x""yes; then :
++if test "x$ac_cv_func_strerror_r" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRERROR_R 1
+ _ACEOF
+@@ -17705,7 +17716,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+ $as_echo_n "checking whether strerror_r returns char *... " >&6; }
+-if test "${ac_cv_func_strerror_r_char_p+set}" = set; then :
++if ${ac_cv_func_strerror_r_char_p+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -17776,7 +17787,7 @@ fi
+ 
+   ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "#include <signal.h>
+ "
+-if test "x$ac_cv_type_sig_atomic_t" = x""yes; then :
++if test "x$ac_cv_type_sig_atomic_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SIG_ATOMIC_T 1
+@@ -17795,7 +17806,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ungetc works on arbitrary bytes" >&5
+ $as_echo_n "checking whether ungetc works on arbitrary bytes... " >&6; }
+-if test "${gl_cv_func_ungetc_works+set}" = set; then :
++if ${gl_cv_func_ungetc_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -17848,7 +17859,7 @@ $as_echo "#define FUNC_UNGETC_BROKEN 1" >>confdefs.h
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5
+ $as_echo_n "checking type of array argument to getgroups... " >&6; }
+-if test "${ac_cv_type_getgroups+set}" = set; then :
++if ${ac_cv_type_getgroups+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -17914,7 +17925,7 @@ _ACEOF
+ 
+ 
+ ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups"
+-if test "x$ac_cv_func_getgroups" = x""yes; then :
++if test "x$ac_cv_func_getgroups" = xyes; then :
+ 
+ fi
+ 
+@@ -17925,7 +17936,7 @@ ac_save_LIBS=$LIBS
+ if test $ac_cv_func_getgroups = no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5
+ $as_echo_n "checking for getgroups in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_getgroups+set}" = set; then :
++if ${ac_cv_lib_bsd_getgroups+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -17959,7 +17970,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_getgroups" >&5
+ $as_echo "$ac_cv_lib_bsd_getgroups" >&6; }
+-if test "x$ac_cv_lib_bsd_getgroups" = x""yes; then :
++if test "x$ac_cv_lib_bsd_getgroups" = xyes; then :
+   GETGROUPS_LIB=-lbsd
+ fi
+ 
+@@ -17970,7 +17981,7 @@ fi
+ if test $ac_cv_func_getgroups = yes; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getgroups" >&5
+ $as_echo_n "checking for working getgroups... " >&6; }
+-if test "${ac_cv_func_getgroups_works+set}" = set; then :
++if ${ac_cv_func_getgroups_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -18068,7 +18079,7 @@ LIBS=$ac_save_LIBS
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
+ $as_echo_n "checking absolute name of <inttypes.h>... " >&6; }
+-if test "${gl_cv_next_inttypes_h+set}" = set; then :
++if ${gl_cv_next_inttypes_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -18128,7 +18139,7 @@ $as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h
+   for ac_header in inttypes.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+-if test "x$ac_cv_header_inttypes_h" = x""yes; then :
++if test "x$ac_cv_header_inttypes_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_INTTYPES_H 1
+ _ACEOF
+@@ -18140,7 +18151,7 @@ done
+   if test $ac_cv_header_inttypes_h = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
+ $as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
+-if test "${gt_cv_inttypes_pri_broken+set}" = set; then :
++if ${gt_cv_inttypes_pri_broken+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -18202,7 +18213,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+ $as_echo_n "checking for LC_MESSAGES... " >&6; }
+-if test "${gt_cv_val_LC_MESSAGES+set}" = set; then :
++if ${gt_cv_val_LC_MESSAGES+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18235,7 +18246,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
++if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_LIBS="$LIBS"
+@@ -18269,7 +18280,7 @@ $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+   fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+ $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
++if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_LIBS="$LIBS"
+@@ -18314,7 +18325,7 @@ $as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_alarm" = x""yes; then :
++if test "x$ac_cv_have_decl_alarm" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -18385,7 +18396,7 @@ _ACEOF
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn works" >&5
+ $as_echo_n "checking whether posix_spawn works... " >&6; }
+-if test "${gl_cv_func_posix_spawn_works+set}" = set; then :
++if ${gl_cv_func_posix_spawn_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test $cross_compiling = no; then
+@@ -18723,7 +18734,7 @@ $as_echo "$gl_cv_func_posix_spawn_works" >&6; }
+       *yes)
+                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5
+ $as_echo_n "checking whether posix_spawnattr_setschedpolicy is supported... " >&6; }
+-if test "${gl_cv_func_spawnattr_setschedpolicy+set}" = set; then :
++if ${gl_cv_func_spawnattr_setschedpolicy+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18749,7 +18760,7 @@ fi
+ $as_echo "$gl_cv_func_spawnattr_setschedpolicy" >&6; }
+                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5
+ $as_echo_n "checking whether posix_spawnattr_setschedparam is supported... " >&6; }
+-if test "${gl_cv_func_spawnattr_setschedparam+set}" = set; then :
++if ${gl_cv_func_spawnattr_setschedparam+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18780,7 +18791,7 @@ $as_echo "$gl_cv_func_spawnattr_setschedparam" >&6; }
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_setenv" = x""yes; then :
++if test "x$ac_cv_have_decl_setenv" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -18828,7 +18839,7 @@ _ACEOF
+   for ac_header in search.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
+-if test "x$ac_cv_header_search_h" = x""yes; then :
++if test "x$ac_cv_header_search_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SEARCH_H 1
+ _ACEOF
+@@ -18840,7 +18851,7 @@ done
+   for ac_func in tsearch
+ do :
+   ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
+-if test "x$ac_cv_func_tsearch" = x""yes; then :
++if test "x$ac_cv_func_tsearch" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_TSEARCH 1
+ _ACEOF
+@@ -18867,7 +18878,7 @@ done
+ 
+ 
+       ac_fn_c_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_unsetenv" = x""yes; then :
++if test "x$ac_cv_have_decl_unsetenv" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -18949,7 +18960,7 @@ LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
+   if test $ac_cv_working_alloca_h = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5
+ $as_echo_n "checking for alloca as a compiler built-in... " >&6; }
+-if test "${gl_cv_rpl_alloca+set}" = set; then :
++if ${gl_cv_rpl_alloca+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -19030,7 +19041,7 @@ fi
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <arpa/inet.h>" >&5
+ $as_echo_n "checking absolute name of <arpa/inet.h>... " >&6; }
+-if test "${gl_cv_next_arpa_inet_h+set}" = set; then :
++if ${gl_cv_next_arpa_inet_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -19120,7 +19131,7 @@ $as_echo "#define GNULIB_TEST_BIND 1" >>confdefs.h
+     for ac_header in byteswap.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
+-if test "x$ac_cv_header_byteswap_h" = x""yes; then :
++if test "x$ac_cv_header_byteswap_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BYTESWAP_H 1
+ _ACEOF
+@@ -19316,7 +19327,7 @@ $as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -19451,7 +19462,7 @@ $as_echo "#define GNULIB_TEST_CONNECT 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+ $as_echo_n "checking whether // is distinct from /... " >&6; }
+-if test "${gl_cv_double_slash_root+set}" = set; then :
++if ${gl_cv_double_slash_root+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+    if test x"$cross_compiling" = xyes ; then
+@@ -19497,7 +19508,7 @@ $as_echo "#define HAVE_DUP2 1" >>confdefs.h
+   if test $HAVE_DUP2 = 1; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
+ $as_echo_n "checking whether dup2 works... " >&6; }
+-if test "${gl_cv_func_dup2_works+set}" = set; then :
++if ${gl_cv_func_dup2_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -19618,7 +19629,7 @@ $as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5
+ $as_echo_n "checking whether fflush works on input streams... " >&6; }
+-if test "${gl_cv_func_fflush_stdin+set}" = set; then :
++if ${gl_cv_func_fflush_stdin+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   echo hello world > conftest.txt
+@@ -19755,7 +19766,7 @@ $as_echo "#define GNULIB_TEST_FCLOSE 1" >>confdefs.h
+   else
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+ $as_echo_n "checking whether fcntl handles F_DUPFD correctly... " >&6; }
+-if test "${gl_cv_func_fcntl_f_dupfd_works+set}" = set; then :
++if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -19819,7 +19830,7 @@ $as_echo "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
+ $as_echo_n "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
+-if test "${gl_cv_func_fcntl_f_dupfd_cloexec+set}" = set; then :
++if ${gl_cv_func_fcntl_f_dupfd_cloexec+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -19932,7 +19943,7 @@ $as_echo "#define GNULIB_TEST_FCNTL 1" >>confdefs.h
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+ $as_echo_n "checking absolute name of <fcntl.h>... " >&6; }
+-if test "${gl_cv_next_fcntl_h+set}" = set; then :
++if ${gl_cv_next_fcntl_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -19980,7 +19991,7 @@ $as_echo "$gl_cv_next_fcntl_h" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5
+ $as_echo_n "checking whether fflush works on input streams... " >&6; }
+-if test "${gl_cv_func_fflush_stdin+set}" = set; then :
++if ${gl_cv_func_fflush_stdin+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   echo hello world > conftest.txt
+@@ -20184,7 +20195,7 @@ rm -f conftest*
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <float.h>" >&5
+ $as_echo_n "checking absolute name of <float.h>... " >&6; }
+-if test "${gl_cv_next_float_h+set}" = set; then :
++if ${gl_cv_next_float_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -20259,7 +20270,7 @@ fi
+   gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working $gl_fnmatch_required fnmatch" >&5
+ $as_echo_n "checking for working $gl_fnmatch_required fnmatch... " >&6; }
+-if eval "test \"\${$gl_fnmatch_cache_var+set}\"" = set; then :
++if eval \${$gl_fnmatch_cache_var+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+                            if test $gl_fnmatch_required = GNU; then
+@@ -20408,7 +20419,7 @@ _ACEOF
+ 
+   ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
+ "
+-if test "x$ac_cv_have_decl_isblank" = x""yes; then :
++if test "x$ac_cv_have_decl_isblank" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -20473,7 +20484,7 @@ fi
+ 
+   ac_fn_c_check_decl "$LINENO" "fpurge" "ac_cv_have_decl_fpurge" "#include <stdio.h>
+ "
+-if test "x$ac_cv_have_decl_fpurge" = x""yes; then :
++if test "x$ac_cv_have_decl_fpurge" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -20488,7 +20499,7 @@ _ACEOF
+     # Detect BSD bug.  Only cygwin 1.7 is known to be immune.
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fpurge works" >&5
+ $as_echo_n "checking whether fpurge works... " >&6; }
+-if test "${gl_cv_func_fpurge_works+set}" = set; then :
++if ${gl_cv_func_fpurge_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -20622,7 +20633,7 @@ $as_echo "#define GNULIB_TEST_FSEEK 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5
+ $as_echo_n "checking for fseeko... " >&6; }
+-if test "${gl_cv_func_fseeko+set}" = set; then :
++if ${gl_cv_func_fseeko+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -20671,7 +20682,7 @@ $as_echo "$gl_cv_func_fseeko" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fflush works on input streams" >&5
+ $as_echo_n "checking whether fflush works on input streams... " >&6; }
+-if test "${gl_cv_func_fflush_stdin+set}" = set; then :
++if ${gl_cv_func_fflush_stdin+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   echo hello world > conftest.txt
+@@ -20829,7 +20840,7 @@ $as_echo "#define GNULIB_TEST_FTELL 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftello" >&5
+ $as_echo_n "checking for ftello... " >&6; }
+-if test "${gl_cv_func_ftello+set}" = set; then :
++if ${gl_cv_func_ftello+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -20864,7 +20875,7 @@ $as_echo "$gl_cv_func_ftello" >&6; }
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ftello works" >&5
+ $as_echo_n "checking whether ftello works... " >&6; }
+-if test "${gl_cv_func_ftello_works+set}" = set; then :
++if ${gl_cv_func_ftello_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -20993,7 +21004,7 @@ $as_echo "#define GNULIB_TEST_FTELLO 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __func__ is available" >&5
+ $as_echo_n "checking whether __func__ is available... " >&6; }
+-if test "${gl_cv_var_func+set}" = set; then :
++if ${gl_cv_var_func+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -21030,7 +21041,7 @@ $as_echo "$as_me: checking how to do getaddrinfo, freeaddrinfo and getnameinfo"
+ 
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
+ $as_echo_n "checking for library containing getaddrinfo... " >&6; }
+-if test "${ac_cv_search_getaddrinfo+set}" = set; then :
++if ${ac_cv_search_getaddrinfo+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -21064,11 +21075,11 @@ for ac_lib in '' socket network net; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_getaddrinfo+set}" = set; then :
++  if ${ac_cv_search_getaddrinfo+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_getaddrinfo+set}" = set; then :
++if ${ac_cv_search_getaddrinfo+:} false; then :
+ 
+ else
+   ac_cv_search_getaddrinfo=no
+@@ -21091,7 +21102,7 @@ fi
+   HAVE_GETADDRINFO=1
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+ $as_echo_n "checking for getaddrinfo... " >&6; }
+-if test "${gl_cv_func_getaddrinfo+set}" = set; then :
++if ${gl_cv_func_getaddrinfo+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -21128,7 +21139,7 @@ $as_echo "$gl_cv_func_getaddrinfo" >&6; }
+   if test $gl_cv_func_getaddrinfo = no; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in ws2tcpip.h and -lws2_32" >&5
+ $as_echo_n "checking for getaddrinfo in ws2tcpip.h and -lws2_32... " >&6; }
+-if test "${gl_cv_w32_getaddrinfo+set}" = set; then :
++if ${gl_cv_w32_getaddrinfo+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -21186,7 +21197,7 @@ $as_echo "$gl_cv_w32_getaddrinfo" >&6; }
+ #include <stddef.h>
+ 
+ "
+-if test "x$ac_cv_have_decl_gai_strerror" = x""yes; then :
++if test "x$ac_cv_have_decl_gai_strerror" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -21214,7 +21225,7 @@ ac_fn_c_check_decl "$LINENO" "gai_strerrorA" "ac_cv_have_decl_gai_strerrorA" "
+ #include <stddef.h>
+ 
+ "
+-if test "x$ac_cv_have_decl_gai_strerrorA" = x""yes; then :
++if test "x$ac_cv_have_decl_gai_strerrorA" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -21232,7 +21243,7 @@ fi
+   if test $ac_cv_have_decl_gai_strerror = yes; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror with POSIX signature" >&5
+ $as_echo_n "checking for gai_strerror with POSIX signature... " >&6; }
+-if test "${gl_cv_func_gai_strerror_posix_signature+set}" = set; then :
++if ${gl_cv_func_gai_strerror_posix_signature+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -21285,7 +21296,7 @@ $as_echo "$gl_cv_func_gai_strerror_posix_signature" >&6; }
+ #include <sys/socket.h>
+ 
+ "
+-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
++if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
+@@ -21319,7 +21330,7 @@ fi
+ #endif
+ 
+ "
+-if test "x$ac_cv_have_decl_getaddrinfo" = x""yes; then :
++if test "x$ac_cv_have_decl_getaddrinfo" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -21344,7 +21355,7 @@ ac_fn_c_check_decl "$LINENO" "freeaddrinfo" "ac_cv_have_decl_freeaddrinfo" "
+ #endif
+ 
+ "
+-if test "x$ac_cv_have_decl_freeaddrinfo" = x""yes; then :
++if test "x$ac_cv_have_decl_freeaddrinfo" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -21369,7 +21380,7 @@ ac_fn_c_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" "
+ #endif
+ 
+ "
+-if test "x$ac_cv_have_decl_getnameinfo" = x""yes; then :
++if test "x$ac_cv_have_decl_getnameinfo" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -21405,7 +21416,7 @@ _ACEOF
+ #endif
+ 
+ "
+-if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
++if test "x$ac_cv_type_struct_addrinfo" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ADDRINFO 1
+@@ -21537,7 +21548,7 @@ $as_echo "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
+     HAVE_GETDELIM=1
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
+ $as_echo_n "checking for working getdelim function... " >&6; }
+-if test "${gl_cv_func_working_getdelim+set}" = set; then :
++if ${gl_cv_func_working_getdelim+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+@@ -21643,7 +21654,7 @@ fi
+ done
+ 
+   ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
++if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -21726,7 +21737,7 @@ $as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -21750,7 +21761,7 @@ done
+   for ac_func in gethostname
+ do :
+   ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
+-if test "x$ac_cv_func_gethostname" = x""yes; then :
++if test "x$ac_cv_func_gethostname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTNAME 1
+ _ACEOF
+@@ -21759,7 +21770,7 @@ else
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking for gethostname in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_w32_gethostname+set}" = set; then :
++if ${gl_cv_w32_gethostname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_w32_gethostname=no
+@@ -21827,7 +21838,7 @@ done
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HOST_NAME_MAX" >&5
+ $as_echo_n "checking for HOST_NAME_MAX... " >&6; }
+-if test "${gl_cv_decl_HOST_NAME_MAX+set}" = set; then :
++if ${gl_cv_decl_HOST_NAME_MAX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -21900,7 +21911,7 @@ if test $HAVE_GETHOSTNAME = 0; then
+     for ac_func in uname
+ do :
+   ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname"
+-if test "x$ac_cv_func_uname" = x""yes; then :
++if test "x$ac_cv_func_uname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_UNAME 1
+ _ACEOF
+@@ -21941,7 +21952,7 @@ $as_echo "#define GNULIB_TEST_GETHOSTNAME 1" >>confdefs.h
+ 
+   gl_getline_needs_run_time_check=no
+   ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
+-if test "x$ac_cv_func_getline" = x""yes; then :
++if test "x$ac_cv_func_getline" = xyes; then :
+                    gl_getline_needs_run_time_check=yes
+ else
+   am_cv_func_working_getline=no
+@@ -21950,7 +21961,7 @@ fi
+   if test $gl_getline_needs_run_time_check = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
+ $as_echo_n "checking for working getline function... " >&6; }
+-if test "${am_cv_func_working_getline+set}" = set; then :
++if ${am_cv_func_working_getline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+@@ -22066,7 +22077,7 @@ $as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
+   for ac_func in getpass
+ do :
+   ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
+-if test "x$ac_cv_func_getpass" = x""yes; then :
++if test "x$ac_cv_func_getpass" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETPASS 1
+ _ACEOF
+@@ -22127,7 +22138,7 @@ if test $HAVE_GETPASS = 0; then
+       #include <stdio_ext.h>
+      #endif
+ "
+-if test "x$ac_cv_have_decl___fsetlocking" = x""yes; then :
++if test "x$ac_cv_have_decl___fsetlocking" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -22254,7 +22265,7 @@ $as_echo "#define GNULIB_TEST_GETSOCKNAME 1" >>confdefs.h
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5
+ $as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; }
+-if test "${gl_cv_func_gettimeofday_clobber+set}" = set; then :
++if ${gl_cv_func_gettimeofday_clobber+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -22314,7 +22325,7 @@ $as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
+ $as_echo_n "checking for gettimeofday with POSIX signature... " >&6; }
+-if test "${gl_cv_func_gettimeofday_posix_signature+set}" = set; then :
++if ${gl_cv_func_gettimeofday_posix_signature+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -22395,7 +22406,7 @@ if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+   for ac_header in sys/timeb.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_timeb_h" = x""yes; then :
++if test "x$ac_cv_header_sys_timeb_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SYS_TIMEB_H 1
+ _ACEOF
+@@ -22407,7 +22418,7 @@ done
+   for ac_func in _ftime
+ do :
+   ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime"
+-if test "x$ac_cv_func__ftime" = x""yes; then :
++if test "x$ac_cv_func__ftime" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE__FTIME 1
+ _ACEOF
+@@ -22445,7 +22456,7 @@ ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
+   gl_saved_libs="$LIBS"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+ $as_echo_n "checking for library containing gethostbyname... " >&6; }
+-if test "${ac_cv_search_gethostbyname+set}" = set; then :
++if ${ac_cv_search_gethostbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -22479,11 +22490,11 @@ for ac_lib in '' nsl network net; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_gethostbyname+set}" = set; then :
++  if ${ac_cv_search_gethostbyname+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_gethostbyname+set}" = set; then :
++if ${ac_cv_search_gethostbyname+:} false; then :
+ 
+ else
+   ac_cv_search_gethostbyname=no
+@@ -22506,7 +22517,7 @@ fi
+     for ac_func in gethostbyname
+ do :
+   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++if test "x$ac_cv_func_gethostbyname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME 1
+ _ACEOF
+@@ -22515,7 +22526,7 @@ else
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking for gethostbyname in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_w32_gethostbyname+set}" = set; then :
++if ${gl_cv_w32_gethostbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_w32_gethostbyname=no
+@@ -22565,7 +22576,7 @@ done
+   gl_save_LIBS=$LIBS
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5
+ $as_echo_n "checking for library containing inet_ntop... " >&6; }
+-if test "${ac_cv_search_inet_ntop+set}" = set; then :
++if ${ac_cv_search_inet_ntop+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -22599,11 +22610,11 @@ for ac_lib in '' nsl; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_inet_ntop+set}" = set; then :
++  if ${ac_cv_search_inet_ntop+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_inet_ntop+set}" = set; then :
++if ${ac_cv_search_inet_ntop+:} false; then :
+ 
+ else
+   ac_cv_search_inet_ntop=no
+@@ -22621,7 +22632,7 @@ else
+   for ac_func in inet_ntop
+ do :
+   ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+-if test "x$ac_cv_func_inet_ntop" = x""yes; then :
++if test "x$ac_cv_func_inet_ntop" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_INET_NTOP 1
+ _ACEOF
+@@ -22657,7 +22668,7 @@ fi
+      #endif
+ 
+ "
+-if test "x$ac_cv_have_decl_inet_ntop" = x""yes; then :
++if test "x$ac_cv_have_decl_inet_ntop" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -22704,7 +22715,7 @@ fi
+   gl_save_LIBS=$LIBS
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_pton" >&5
+ $as_echo_n "checking for library containing inet_pton... " >&6; }
+-if test "${ac_cv_search_inet_pton+set}" = set; then :
++if ${ac_cv_search_inet_pton+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -22738,11 +22749,11 @@ for ac_lib in '' nsl; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_inet_pton+set}" = set; then :
++  if ${ac_cv_search_inet_pton+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_inet_pton+set}" = set; then :
++if ${ac_cv_search_inet_pton+:} false; then :
+ 
+ else
+   ac_cv_search_inet_pton=no
+@@ -22760,7 +22771,7 @@ else
+   for ac_func in inet_pton
+ do :
+   ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
+-if test "x$ac_cv_func_inet_pton" = x""yes; then :
++if test "x$ac_cv_func_inet_pton" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_INET_PTON 1
+ _ACEOF
+@@ -22796,7 +22807,7 @@ fi
+      #endif
+ 
+ "
+-if test "x$ac_cv_have_decl_inet_pton" = x""yes; then :
++if test "x$ac_cv_have_decl_inet_pton" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -22846,7 +22857,7 @@ fi
+     for ac_func in ioctl
+ do :
+   ac_fn_c_check_func "$LINENO" "ioctl" "ac_cv_func_ioctl"
+-if test "x$ac_cv_func_ioctl" = x""yes; then :
++if test "x$ac_cv_func_ioctl" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_IOCTL 1
+ _ACEOF
+@@ -22856,7 +22867,7 @@ done
+ 
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ioctl with POSIX signature" >&5
+ $as_echo_n "checking for ioctl with POSIX signature... " >&6; }
+-if test "${gl_cv_func_ioctl_posix_signature+set}" = set; then :
++if ${gl_cv_func_ioctl_posix_signature+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -22974,7 +22985,7 @@ LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_ba
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lseek detects pipes" >&5
+ $as_echo_n "checking whether lseek detects pipes... " >&6; }
+-if test "${gl_cv_func_lseek_pipe+set}" = set; then :
++if ${gl_cv_func_lseek_pipe+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test $cross_compiling = no; then
+@@ -23182,7 +23193,7 @@ $as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+ $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
++if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23245,7 +23256,7 @@ $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+ $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
++if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23339,7 +23350,7 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
+ $as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
+-if test "${gl_cv_func_mbrtowc_null_arg1+set}" = set; then :
++if ${gl_cv_func_mbrtowc_null_arg1+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23416,7 +23427,7 @@ $as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
+ $as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
+-if test "${gl_cv_func_mbrtowc_null_arg2+set}" = set; then :
++if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23483,7 +23494,7 @@ $as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
+ $as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
+-if test "${gl_cv_func_mbrtowc_retval+set}" = set; then :
++if ${gl_cv_func_mbrtowc_retval+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23619,7 +23630,7 @@ $as_echo "$gl_cv_func_mbrtowc_retval" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
+ $as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
+-if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then :
++if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23770,7 +23781,7 @@ $as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+ $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
++if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23833,7 +23844,7 @@ $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+ $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
++if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23986,7 +23997,7 @@ $as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+ $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
++if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -24049,7 +24060,7 @@ $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+ $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
++if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -24146,7 +24157,7 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbsrtowcs works" >&5
+ $as_echo_n "checking whether mbsrtowcs works... " >&6; }
+-if test "${gl_cv_func_mbsrtowcs_works+set}" = set; then :
++if ${gl_cv_func_mbsrtowcs_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -24314,7 +24325,7 @@ if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+   for ac_header in bp-sym.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
+-if test "x$ac_cv_header_bp_sym_h" = x""yes; then :
++if test "x$ac_cv_header_bp_sym_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BP_SYM_H 1
+ _ACEOF
+@@ -24353,7 +24364,7 @@ $as_echo "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
+   if test $ac_cv_func_mkstemp = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mkstemp" >&5
+ $as_echo_n "checking for working mkstemp... " >&6; }
+-if test "${gl_cv_func_working_mkstemp+set}" = set; then :
++if ${gl_cv_func_working_mkstemp+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -24524,7 +24535,7 @@ $as_echo "#define GNULIB_TEST_MKSTEMPS 1" >>confdefs.h
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
+ $as_echo_n "checking for working mktime... " >&6; }
+-if test "${gl_cv_func_working_mktime+set}" = set; then :
++if ${gl_cv_func_working_mktime+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -24778,7 +24789,7 @@ $as_echo "#define GNULIB_TEST_MKTIME 1" >>confdefs.h
+ 
+   if test $REPLACE_MKTIME = 0; then
+         ac_fn_c_check_func "$LINENO" "__mktime_internal" "ac_cv_func___mktime_internal"
+-if test "x$ac_cv_func___mktime_internal" = x""yes; then :
++if test "x$ac_cv_func___mktime_internal" = xyes; then :
+ 
+ $as_echo "#define mktime_internal __mktime_internal" >>confdefs.h
+ 
+@@ -24828,7 +24839,7 @@ fi
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <netdb.h>" >&5
+ $as_echo_n "checking absolute name of <netdb.h>... " >&6; }
+-if test "${gl_cv_next_netdb_h+set}" = set; then :
++if ${gl_cv_next_netdb_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -24886,7 +24897,7 @@ $as_echo "$gl_cv_next_netdb_h" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <netinet/in.h> is self-contained" >&5
+ $as_echo_n "checking whether <netinet/in.h> is self-contained... " >&6; }
+-if test "${gl_cv_header_netinet_in_h_selfcontained+set}" = set; then :
++if ${gl_cv_header_netinet_in_h_selfcontained+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -24918,7 +24929,7 @@ $as_echo "$gl_cv_header_netinet_in_h_selfcontained" >&6; }
+     for ac_header in netinet/in.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
+-if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
++if test "x$ac_cv_header_netinet_in_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETINET_IN_H 1
+ _ACEOF
+@@ -24947,7 +24958,7 @@ done
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <netinet/in.h>" >&5
+ $as_echo_n "checking absolute name of <netinet/in.h>... " >&6; }
+-if test "${gl_cv_next_netinet_in_h+set}" = set; then :
++if ${gl_cv_next_netinet_in_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -25057,7 +25068,7 @@ GNULIB_UNISTD_H_NONBLOCKING=1
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
+ $as_echo_n "checking whether open recognizes a trailing slash... " >&6; }
+-if test "${gl_cv_func_open_slash+set}" = set; then :
++if ${gl_cv_func_open_slash+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # Assume that if we have lstat, we can also check symlinks.
+@@ -25184,7 +25195,7 @@ $as_echo "#define _LINUX_SOURCE_COMPAT 1" >>confdefs.h
+     #include <sys/socket.h>
+ 
+ "
+-if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then :
++if test "x$ac_cv_member_struct_msghdr_msg_accrights" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1
+@@ -25222,7 +25233,7 @@ fi
+     unset|*yes)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether perror matches strerror" >&5
+ $as_echo_n "checking whether perror matches strerror... " >&6; }
+-if test "${gl_cv_func_perror_works+set}" = set; then :
++if ${gl_cv_func_perror_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -25323,7 +25334,7 @@ do :
+      #endif
+ 
+ "
+-if test "x$ac_cv_header_sys_sysctl_h" = x""yes; then :
++if test "x$ac_cv_header_sys_sysctl_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SYS_SYSCTL_H 1
+ _ACEOF
+@@ -25426,7 +25437,7 @@ $as_echo "#define GNULIB_TEST_PIPE2 1" >>confdefs.h
+     gl_cv_func_poll=no
+   else
+     ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+-if test "x$ac_cv_func_poll" = x""yes; then :
++if test "x$ac_cv_func_poll" = xyes; then :
+   # Check whether poll() works on special files (like /dev/null) and
+        # and ttys (like /dev/tty). On MacOS X 10.4.0 and AIX 5.3, it doesn't.
+        if test "$cross_compiling" = yes; then :
+@@ -25496,7 +25507,7 @@ fi
+   fi
+   if test $gl_cv_func_poll != yes; then
+     ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+-if test "x$ac_cv_func_poll" = x""yes; then :
++if test "x$ac_cv_func_poll" = xyes; then :
+   ac_cv_func_poll=yes
+ else
+   ac_cv_func_poll=no
+@@ -25592,7 +25603,7 @@ $as_echo "#define GNULIB_TEST_POLL 1" >>confdefs.h
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <poll.h>" >&5
+ $as_echo_n "checking absolute name of <poll.h>... " >&6; }
+-if test "${gl_cv_next_poll_h+set}" = set; then :
++if ${gl_cv_next_poll_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -25644,7 +25655,7 @@ $as_echo "$gl_cv_next_poll_h" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a shell that conforms to POSIX" >&5
+ $as_echo_n "checking for a shell that conforms to POSIX... " >&6; }
+-if test "${gl_cv_posix_shell+set}" = set; then :
++if ${gl_cv_posix_shell+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_test_posix_shell_script='
+@@ -25718,7 +25729,7 @@ $as_echo "$gl_cv_posix_shell" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <pthread.h>" >&5
+ $as_echo_n "checking absolute name of <pthread.h>... " >&6; }
+-if test "${gl_cv_next_pthread_h+set}" = set; then :
++if ${gl_cv_next_pthread_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -25775,7 +25786,7 @@ $as_echo "$gl_cv_next_pthread_h" >&6; }
+        #include <pthread.h>
+       #endif
+ "
+-if test "x$ac_cv_type_pthread_t" = x""yes; then :
++if test "x$ac_cv_type_pthread_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_PTHREAD_T 1
+@@ -25788,7 +25799,7 @@ ac_fn_c_check_type "$LINENO" "pthread_spinlock_t" "ac_cv_type_pthread_spinlock_t
+        #include <pthread.h>
+       #endif
+ "
+-if test "x$ac_cv_type_pthread_spinlock_t" = x""yes; then :
++if test "x$ac_cv_type_pthread_spinlock_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_PTHREAD_SPINLOCK_T 1
+@@ -25826,7 +25837,7 @@ fi
+      gl_saved_libs=$LIBS
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+ $as_echo_n "checking for library containing pthread_create... " >&6; }
+-if test "${ac_cv_search_pthread_create+set}" = set; then :
++if ${ac_cv_search_pthread_create+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -25860,11 +25871,11 @@ for ac_lib in '' pthread; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_pthread_create+set}" = set; then :
++  if ${ac_cv_search_pthread_create+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_pthread_create+set}" = set; then :
++if ${ac_cv_search_pthread_create+:} false; then :
+ 
+ else
+   ac_cv_search_pthread_create=no
+@@ -25916,7 +25927,7 @@ fi
+                 if test -z "$LIB_PTHREAD_SIGMASK"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask works without -lpthread" >&5
+ $as_echo_n "checking whether pthread_sigmask works without -lpthread... " >&6; }
+-if test "${gl_cv_func_pthread_sigmask_in_libc_works+set}" = set; then :
++if ${gl_cv_func_pthread_sigmask_in_libc_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -25968,7 +25979,7 @@ $as_echo "#define PTHREAD_SIGMASK_INEFFECTIVE 1" >>confdefs.h
+ 
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask returns error numbers" >&5
+ $as_echo_n "checking whether pthread_sigmask returns error numbers... " >&6; }
+-if test "${gl_cv_func_pthread_sigmask_return_works+set}" = set; then :
++if ${gl_cv_func_pthread_sigmask_return_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -26023,7 +26034,7 @@ $as_echo "#define PTHREAD_SIGMASK_FAILS_WITH_ERRNO 1" >>confdefs.h
+ 
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask unblocks signals correctly" >&5
+ $as_echo_n "checking whether pthread_sigmask unblocks signals correctly... " >&6; }
+-if test "${gl_cv_func_pthread_sigmask_unblock_works+set}" = set; then :
++if ${gl_cv_func_pthread_sigmask_unblock_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -26140,7 +26151,7 @@ $as_echo "#define GNULIB_TEST_PTHREAD_SIGMASK 1" >>confdefs.h
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "random.h" "ac_cv_header_random_h" "$ac_includes_default
+ "
+-if test "x$ac_cv_header_random_h" = x""yes; then :
++if test "x$ac_cv_header_random_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_RANDOM_H 1
+ _ACEOF
+@@ -26159,7 +26170,7 @@ done
+       #endif
+ 
+ "
+-if test "x$ac_cv_type_struct_random_data" = x""yes; then :
++if test "x$ac_cv_type_struct_random_data" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_RANDOM_DATA 1
+@@ -26174,7 +26185,7 @@ fi
+   for ac_func in random_r
+ do :
+   ac_fn_c_check_func "$LINENO" "random_r" "ac_cv_func_random_r"
+-if test "x$ac_cv_func_random_r" = x""yes; then :
++if test "x$ac_cv_func_random_r" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_RANDOM_R 1
+ _ACEOF
+@@ -26223,7 +26234,7 @@ $as_echo "#define GNULIB_TEST_RANDOM_R 1" >>confdefs.h
+   for ac_func in rawmemchr
+ do :
+   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
+-if test "x$ac_cv_func_rawmemchr" = x""yes; then :
++if test "x$ac_cv_func_rawmemchr" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_RAWMEMCHR 1
+ _ACEOF
+@@ -26277,7 +26288,7 @@ $as_echo "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+ $as_echo_n "checking whether readlink signature is correct... " >&6; }
+-if test "${gl_cv_decl_readlink_works+set}" = set; then :
++if ${gl_cv_decl_readlink_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -26304,7 +26315,7 @@ fi
+ $as_echo "$gl_cv_decl_readlink_works" >&6; }
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+ $as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
+-if test "${gl_cv_func_readlink_works+set}" = set; then :
++if ${gl_cv_func_readlink_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # We have readlink, so assume ln -s works.
+@@ -26486,7 +26497,7 @@ else
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sched.h>" >&5
+ $as_echo_n "checking absolute name of <sched.h>... " >&6; }
+-if test "${gl_cv_next_sched_h+set}" = set; then :
++if ${gl_cv_next_sched_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -26542,7 +26553,7 @@ $as_echo "$gl_cv_next_sched_h" >&6; }
+ 
+      ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include <sched.h>
+ "
+-if test "x$ac_cv_type_struct_sched_param" = x""yes; then :
++if test "x$ac_cv_type_struct_sched_param" = xyes; then :
+   HAVE_STRUCT_SCHED_PARAM=1
+ else
+   HAVE_STRUCT_SCHED_PARAM=0
+@@ -26577,7 +26588,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether select supports a 0 argument" >&5
+ $as_echo_n "checking whether select supports a 0 argument... " >&6; }
+-if test "${gl_cv_func_select_supports0+set}" = set; then :
++if ${gl_cv_func_select_supports0+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -26686,7 +26697,7 @@ $as_echo "#define GNULIB_TEST_SEND 1" >>confdefs.h
+   gl_saved_libs="$LIBS"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getservbyname" >&5
+ $as_echo_n "checking for library containing getservbyname... " >&6; }
+-if test "${ac_cv_search_getservbyname+set}" = set; then :
++if ${ac_cv_search_getservbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -26720,11 +26731,11 @@ for ac_lib in '' socket network net; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_getservbyname+set}" = set; then :
++  if ${ac_cv_search_getservbyname+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_getservbyname+set}" = set; then :
++if ${ac_cv_search_getservbyname+:} false; then :
+ 
+ else
+   ac_cv_search_getservbyname=no
+@@ -26747,7 +26758,7 @@ fi
+     for ac_func in getservbyname
+ do :
+   ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname"
+-if test "x$ac_cv_func_getservbyname" = x""yes; then :
++if test "x$ac_cv_func_getservbyname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETSERVBYNAME 1
+ _ACEOF
+@@ -26756,7 +26767,7 @@ else
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking for getservbyname in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_w32_getservbyname+set}" = set; then :
++if ${gl_cv_w32_getservbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_w32_getservbyname=no
+@@ -26838,7 +26849,7 @@ $as_echo "#define GNULIB_TEST_SETSOCKOPT 1" >>confdefs.h
+   if test $ac_cv_func_sigaction = yes; then
+     ac_fn_c_check_member "$LINENO" "struct sigaction" "sa_sigaction" "ac_cv_member_struct_sigaction_sa_sigaction" "#include <signal.h>
+ "
+-if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = x""yes; then :
++if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1
+@@ -26884,7 +26895,7 @@ if test $HAVE_SIGACTION = 0; then
+ #include <signal.h>
+ 
+ "
+-if test "x$ac_cv_type_siginfo_t" = x""yes; then :
++if test "x$ac_cv_type_siginfo_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SIGINFO_T 1
+@@ -26929,7 +26940,7 @@ $as_echo "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+ $as_echo_n "checking absolute name of <signal.h>... " >&6; }
+-if test "${gl_cv_next_signal_h+set}" = set; then :
++if ${gl_cv_next_signal_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -26976,7 +26987,7 @@ $as_echo "$gl_cv_next_signal_h" >&6; }
+ #include <signal.h>
+ 
+ "
+-if test "x$ac_cv_type_volatile_sig_atomic_t" = x""yes; then :
++if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes; then :
+ 
+ else
+   HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
+@@ -26990,7 +27001,7 @@ fi
+ #include <signal.h>
+ 
+ "
+-if test "x$ac_cv_type_sighandler_t" = x""yes; then :
++if test "x$ac_cv_type_sighandler_t" = xyes; then :
+ 
+ else
+   HAVE_SIGHANDLER_T=0
+@@ -27021,7 +27032,7 @@ GNULIB_UNISTD_H_SIGPIPE=1
+ 
+   if test $gl_cv_type_sigset_t = yes; then
+     ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+-if test "x$ac_cv_func_sigprocmask" = x""yes; then :
++if test "x$ac_cv_func_sigprocmask" = xyes; then :
+   gl_cv_func_sigprocmask=1
+ fi
+ 
+@@ -27062,7 +27073,7 @@ $as_echo "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+   for ac_header in stdint.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdint_h" = x""yes; then :
++if test "x$ac_cv_header_stdint_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STDINT_H 1
+ _ACEOF
+@@ -27073,7 +27084,7 @@ done
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
+ $as_echo_n "checking for SIZE_MAX... " >&6; }
+-  if test "${gl_cv_size_max+set}" = set; then :
++  if ${gl_cv_size_max+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -27157,7 +27168,7 @@ _ACEOF
+ 
+             ac_fn_c_check_decl "$LINENO" "sleep" "ac_cv_have_decl_sleep" "#include <unistd.h>
+ "
+-if test "x$ac_cv_have_decl_sleep" = x""yes; then :
++if test "x$ac_cv_have_decl_sleep" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -27179,7 +27190,7 @@ _ACEOF
+   else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working sleep" >&5
+ $as_echo_n "checking for working sleep... " >&6; }
+-if test "${gl_cv_func_sleep_works+set}" = set; then :
++if ${gl_cv_func_sleep_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -27269,7 +27280,7 @@ $as_echo "#define GNULIB_TEST_SLEEP 1" >>confdefs.h
+   for ac_func in snprintf
+ do :
+   ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+-if test "x$ac_cv_func_snprintf" = x""yes; then :
++if test "x$ac_cv_func_snprintf" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SNPRINTF 1
+ _ACEOF
+@@ -27282,7 +27293,7 @@ done
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
+ $as_echo_n "checking whether snprintf respects a size of 1... " >&6; }
+-if test "${gl_cv_func_snprintf_size1+set}" = set; then :
++if ${gl_cv_func_snprintf_size1+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -27323,7 +27334,7 @@ $as_echo "$gl_cv_func_snprintf_size1" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
+ $as_echo_n "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
+-if test "${gl_cv_func_printf_positions+set}" = set; then :
++if ${gl_cv_func_printf_positions+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -27481,7 +27492,7 @@ $as_echo "#define GNULIB_TEST_SOCKET 1" >>confdefs.h
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -27503,7 +27514,7 @@ done
+   if test $HAVE_WINSOCK2_H = 1; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to call WSAStartup in winsock2.h and -lws2_32" >&5
+ $as_echo_n "checking if we need to call WSAStartup in winsock2.h and -lws2_32... " >&6; }
+-if test "${gl_cv_func_wsastartup+set}" = set; then :
++if ${gl_cv_func_wsastartup+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -27548,7 +27559,7 @@ $as_echo "#define WINDOWS_SOCKETS 1" >>confdefs.h
+   else
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5
+ $as_echo_n "checking for library containing setsockopt... " >&6; }
+-if test "${gl_cv_lib_socket+set}" = set; then :
++if ${gl_cv_lib_socket+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -27676,12 +27687,12 @@ $as_echo "$gl_cv_lib_socket" >&6; }
+ #endif
+ 
+ "
+-if test "x$ac_cv_type_socklen_t" = x""yes; then :
++if test "x$ac_cv_type_socklen_t" = xyes; then :
+ 
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
+ $as_echo_n "checking for socklen_t equivalent... " >&6; }
+-      if test "${gl_cv_socklen_t_equiv+set}" = set; then :
++      if ${gl_cv_socklen_t_equiv+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # Systems have either "struct sockaddr *" or
+@@ -27730,7 +27741,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+ $as_echo_n "checking for ssize_t... " >&6; }
+-if test "${gt_cv_ssize_t+set}" = set; then :
++if ${gt_cv_ssize_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -27771,7 +27782,7 @@ $as_echo "#define ssize_t int" >>confdefs.h
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
+ $as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
+-if test "${gl_cv_func_stat_dir_slash+set}" = set; then :
++if ${gl_cv_func_stat_dir_slash+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -27806,7 +27817,7 @@ fi
+ $as_echo "$gl_cv_func_stat_dir_slash" >&6; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+ $as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
+-if test "${gl_cv_func_stat_file_slash+set}" = set; then :
++if ${gl_cv_func_stat_file_slash+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   touch conftest.tmp
+@@ -27900,7 +27911,7 @@ $as_echo "#define GNULIB_TEST_STAT 1" >>confdefs.h
+   NEXT_STDARG_H='<stdarg.h>'
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
+ $as_echo_n "checking for va_copy... " >&6; }
+-  if test "${gl_cv_func_va_copy+set}" = set; then :
++  if ${gl_cv_func_va_copy+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -27960,7 +27971,7 @@ rm -f conftest*
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdarg.h>" >&5
+ $as_echo_n "checking absolute name of <stdarg.h>... " >&6; }
+-if test "${gl_cv_next_stdarg_h+set}" = set; then :
++if ${gl_cv_next_stdarg_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -28008,7 +28019,7 @@ $as_echo "$gl_cv_next_stdarg_h" >&6; }
+ 
+   saved_as_echo_n="$as_echo_n"
+   as_echo_n=':'
+-  if test "${gl_cv_func___va_copy+set}" = set; then :
++  if ${gl_cv_func___va_copy+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -28097,7 +28108,7 @@ fi
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+ $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
+-if test "${gl_cv_decl_null_works+set}" = set; then :
++if ${gl_cv_decl_null_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -28149,7 +28160,7 @@ fi
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+ $as_echo_n "checking absolute name of <stddef.h>... " >&6; }
+-if test "${gl_cv_next_stddef_h+set}" = set; then :
++if ${gl_cv_next_stddef_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -28208,7 +28219,7 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+ $as_echo_n "checking absolute name of <stdio.h>... " >&6; }
+-if test "${gl_cv_next_stdio_h+set}" = set; then :
++if ${gl_cv_next_stdio_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -28340,7 +28351,7 @@ $as_echo "$gl_cv_next_stdio_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+ $as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
+-if test "${gl_cv_next_stdlib_h+set}" = set; then :
++if ${gl_cv_next_stdlib_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -28392,7 +28403,7 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
+   for ac_func in stpcpy
+ do :
+   ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
+-if test "x$ac_cv_func_stpcpy" = x""yes; then :
++if test "x$ac_cv_func_stpcpy" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STPCPY 1
+ _ACEOF
+@@ -28441,7 +28452,7 @@ $as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
+   for ac_func in strchrnul
+ do :
+   ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
+-if test "x$ac_cv_func_strchrnul" = x""yes; then :
++if test "x$ac_cv_func_strchrnul" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRCHRNUL 1
+ _ACEOF
+@@ -28454,7 +28465,7 @@ done
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
+ $as_echo_n "checking whether strchrnul works... " >&6; }
+-if test "${gl_cv_func_strchrnul_works+set}" = set; then :
++if ${gl_cv_func_strchrnul_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -28607,7 +28618,7 @@ $as_echo "#define GNULIB_TEST_STRDUP 1" >>confdefs.h
+   if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+ $as_echo_n "checking for working strerror function... " >&6; }
+-if test "${gl_cv_func_working_strerror+set}" = set; then :
++if ${gl_cv_func_working_strerror+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -28711,7 +28722,7 @@ if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -28838,7 +28849,7 @@ $as_echo "#define GNULIB_TEST_STRERROR_R 1" >>confdefs.h
+     # AIX 4.3.3, AIX 5.1 have a function that fails to add the terminating '\0'.
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strndup" >&5
+ $as_echo_n "checking for working strndup... " >&6; }
+-if test "${gl_cv_func_strndup_works+set}" = set; then :
++if ${gl_cv_func_strndup_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -28936,13 +28947,17 @@ $as_echo "#define GNULIB_TEST_STRNDUP 1" >>confdefs.h
+     HAVE_DECL_STRNLEN=0
+   else
+ 
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
++         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+ $as_echo_n "checking for working strnlen... " >&6; }
+-if test "${ac_cv_func_strnlen_working+set}" = set; then :
++if ${ac_cv_func_strnlen_working+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+-  ac_cv_func_strnlen_working=no
++  # Guess no on AIX systems, yes otherwise.
++		case "$host_os" in
++		  aix*) ac_cv_func_strnlen_working=no;;
++		  *)    ac_cv_func_strnlen_working=yes;;
++		esac
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -29072,7 +29087,7 @@ $as_echo "#define GNULIB_TEST_STRPTIME 1" >>confdefs.h
+   for ac_func in strsep
+ do :
+   ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
+-if test "x$ac_cv_func_strsep" = x""yes; then :
++if test "x$ac_cv_func_strsep" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRSEP 1
+ _ACEOF
+@@ -29119,7 +29134,7 @@ $as_echo "#define GNULIB_TEST_STRSEP 1" >>confdefs.h
+      for ac_func in strtok_r
+ do :
+   ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
+-if test "x$ac_cv_func_strtok_r" = x""yes; then :
++if test "x$ac_cv_func_strtok_r" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRTOK_R 1
+ _ACEOF
+@@ -29131,7 +29146,7 @@ done
+     HAVE_STRTOK_R=1
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtok_r works" >&5
+ $as_echo_n "checking whether strtok_r works... " >&6; }
+-if test "${gl_cv_func_strtok_r_works+set}" = set; then :
++if ${gl_cv_func_strtok_r_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -29245,7 +29260,7 @@ $as_echo "#define GNULIB_TEST_STRTOK_R 1" >>confdefs.h
+     HAVE_SYS_IOCTL_H=1
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/ioctl.h> declares ioctl" >&5
+ $as_echo_n "checking whether <sys/ioctl.h> declares ioctl... " >&6; }
+-if test "${gl_cv_decl_ioctl_in_sys_ioctl_h+set}" = set; then :
++if ${gl_cv_decl_ioctl_in_sys_ioctl_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -29294,7 +29309,7 @@ $as_echo "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/ioctl.h>" >&5
+ $as_echo_n "checking absolute name of <sys/ioctl.h>... " >&6; }
+-if test "${gl_cv_next_sys_ioctl_h+set}" = set; then :
++if ${gl_cv_next_sys_ioctl_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29349,7 +29364,7 @@ $as_echo "$gl_cv_next_sys_ioctl_h" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/select.h> is self-contained" >&5
+ $as_echo_n "checking whether <sys/select.h> is self-contained... " >&6; }
+-if test "${gl_cv_header_sys_select_h_selfcontained+set}" = set; then :
++if ${gl_cv_header_sys_select_h_selfcontained+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29448,7 +29463,7 @@ $as_echo "$gl_cv_header_sys_select_h_selfcontained" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/select.h>" >&5
+ $as_echo_n "checking absolute name of <sys/select.h>... " >&6; }
+-if test "${gl_cv_next_sys_select_h+set}" = set; then :
++if ${gl_cv_next_sys_select_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29514,7 +29529,7 @@ $as_echo "$gl_cv_next_sys_select_h" >&6; }
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -29552,7 +29567,7 @@ $as_echo "#define _POSIX_PII_SOCKET 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> is self-contained" >&5
+ $as_echo_n "checking whether <sys/socket.h> is self-contained... " >&6; }
+-if test "${gl_cv_header_sys_socket_h_selfcontained+set}" = set; then :
++if ${gl_cv_header_sys_socket_h_selfcontained+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29581,7 +29596,7 @@ $as_echo "$gl_cv_header_sys_socket_h_selfcontained" >&6; }
+             for ac_func in shutdown
+ do :
+   ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
+-if test "x$ac_cv_func_shutdown" = x""yes; then :
++if test "x$ac_cv_func_shutdown" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SHUTDOWN 1
+ _ACEOF
+@@ -29592,7 +29607,7 @@ done
+     if test $ac_cv_func_shutdown = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> defines the SHUT_* macros" >&5
+ $as_echo_n "checking whether <sys/socket.h> defines the SHUT_* macros... " >&6; }
+-if test "${gl_cv_header_sys_socket_h_shut+set}" = set; then :
++if ${gl_cv_header_sys_socket_h_shut+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29645,7 +29660,7 @@ $as_echo "$gl_cv_header_sys_socket_h_shut" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/socket.h>" >&5
+ $as_echo_n "checking absolute name of <sys/socket.h>... " >&6; }
+-if test "${gl_cv_next_sys_socket_h+set}" = set; then :
++if ${gl_cv_next_sys_socket_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29718,7 +29733,7 @@ $as_echo "$gl_cv_next_sys_socket_h" >&6; }
+ #endif
+ 
+ "
+-if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
++if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_STORAGE 1
+@@ -29739,7 +29754,7 @@ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "
+ #endif
+ 
+ "
+-if test "x$ac_cv_type_sa_family_t" = x""yes; then :
++if test "x$ac_cv_type_sa_family_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SA_FAMILY_T 1
+@@ -29764,7 +29779,7 @@ fi
+        #endif
+ 
+ "
+-if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+@@ -29794,7 +29809,7 @@ fi
+                     for ac_header in winsock2.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+-if test "x$ac_cv_header_winsock2_h" = x""yes; then :
++if test "x$ac_cv_header_winsock2_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WINSOCK2_H 1
+ _ACEOF
+@@ -29844,7 +29859,7 @@ done
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+ $as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
+-if test "${gl_cv_next_sys_stat_h+set}" = set; then :
++if ${gl_cv_next_sys_stat_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -29894,7 +29909,7 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; }
+       ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
+      #include <sys/stat.h>
+ "
+-if test "x$ac_cv_type_nlink_t" = x""yes; then :
++if test "x$ac_cv_type_nlink_t" = xyes; then :
+ 
+ else
+ 
+@@ -29932,7 +29947,7 @@ fi
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/uio.h>" >&5
+ $as_echo_n "checking absolute name of <sys/uio.h>... " >&6; }
+-if test "${gl_cv_next_sys_uio_h+set}" = set; then :
++if ${gl_cv_next_sys_uio_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30009,7 +30024,7 @@ $as_echo "$gl_cv_next_sys_uio_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/utsname.h>" >&5
+ $as_echo_n "checking absolute name of <sys/utsname.h>... " >&6; }
+-if test "${gl_cv_next_sys_utsname_h+set}" = set; then :
++if ${gl_cv_next_sys_utsname_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30064,7 +30079,7 @@ $as_echo "$gl_cv_next_sys_utsname_h" >&6; }
+ #include <sys/utsname.h>
+ 
+ "
+-if test "x$ac_cv_type_struct_utsname" = x""yes; then :
++if test "x$ac_cv_type_struct_utsname" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_UTSNAME 1
+@@ -30104,7 +30119,7 @@ fi
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/wait.h>" >&5
+ $as_echo_n "checking absolute name of <sys/wait.h>... " >&6; }
+-if test "${gl_cv_next_sys_wait_h+set}" = set; then :
++if ${gl_cv_next_sys_wait_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30182,7 +30197,7 @@ $as_echo "$gl_cv_next_sys_wait_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <termios.h>" >&5
+ $as_echo_n "checking absolute name of <termios.h>... " >&6; }
+-if test "${gl_cv_next_termios_h+set}" = set; then :
++if ${gl_cv_next_termios_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30269,7 +30284,7 @@ $as_echo "$gl_cv_next_termios_h" >&6; }
+     HAVE_LOCALTIME_R=1
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime_r is compatible with its POSIX signature" >&5
+ $as_echo_n "checking whether localtime_r is compatible with its POSIX signature... " >&6; }
+-if test "${gl_cv_time_r_posix+set}" = set; then :
++if ${gl_cv_time_r_posix+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -30395,7 +30410,7 @@ $as_echo "#define GNULIB_TEST_TIMEGM 1" >>confdefs.h
+   for ac_func in uname
+ do :
+   ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname"
+-if test "x$ac_cv_func_uname" = x""yes; then :
++if test "x$ac_cv_func_uname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_UNAME 1
+ _ACEOF
+@@ -30456,7 +30471,7 @@ fi
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+ $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
+-if test "${gl_cv_next_unistd_h+set}" = set; then :
++if ${gl_cv_next_unistd_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30522,7 +30537,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
+ 
+ 
+   ac_fn_c_check_type "$LINENO" "useconds_t" "ac_cv_type_useconds_t" "$ac_includes_default"
+-if test "x$ac_cv_type_useconds_t" = x""yes; then :
++if test "x$ac_cv_type_useconds_t" = xyes; then :
+ 
+ else
+ 
+@@ -30535,7 +30550,7 @@ fi
+   else
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether usleep allows large arguments" >&5
+ $as_echo_n "checking whether usleep allows large arguments... " >&6; }
+-if test "${gl_cv_func_usleep_works+set}" = set; then :
++if ${gl_cv_func_usleep_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -30672,7 +30687,7 @@ $as_echo "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+ 
+ 
+   ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
++if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+ 
+ else
+ 
+@@ -30693,7 +30708,7 @@ fi
+   for ac_func in vasprintf
+ do :
+   ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+-if test "x$ac_cv_func_vasprintf" = x""yes; then :
++if test "x$ac_cv_func_vasprintf" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_VASPRINTF 1
+ _ACEOF
+@@ -30768,7 +30783,7 @@ $as_echo "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h
+   for ac_func in vsnprintf
+ do :
+   ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+-if test "x$ac_cv_func_vsnprintf" = x""yes; then :
++if test "x$ac_cv_func_vsnprintf" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_VSNPRINTF 1
+ _ACEOF
+@@ -30781,7 +30796,7 @@ done
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
+ $as_echo_n "checking whether snprintf respects a size of 1... " >&6; }
+-if test "${gl_cv_func_snprintf_size1+set}" = set; then :
++if ${gl_cv_func_snprintf_size1+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30822,7 +30837,7 @@ $as_echo "$gl_cv_func_snprintf_size1" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
+ $as_echo_n "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
+-if test "${gl_cv_func_printf_positions+set}" = set; then :
++if ${gl_cv_func_printf_positions+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -30979,7 +30994,7 @@ $as_echo "#define GNULIB_TEST_WAITPID 1" >>confdefs.h
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+ $as_echo_n "checking absolute name of <wchar.h>... " >&6; }
+-if test "${gl_cv_next_wchar_h+set}" = set; then :
++if ${gl_cv_next_wchar_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31092,7 +31107,7 @@ $as_echo "$gl_cv_next_wchar_h" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+ $as_echo_n "checking absolute name of <wctype.h>... " >&6; }
+-if test "${gl_cv_next_wctype_h+set}" = set; then :
++if ${gl_cv_next_wctype_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31142,7 +31157,7 @@ $as_echo "$gl_cv_next_wctype_h" >&6; }
+     if test $ac_cv_func_iswcntrl = yes; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
+ $as_echo_n "checking whether iswcntrl works... " >&6; }
+-if test "${gl_cv_func_iswcntrl_works+set}" = set; then :
++if ${gl_cv_func_iswcntrl_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31217,7 +31232,7 @@ $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
+ 
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
+ $as_echo_n "checking for wctype_t... " >&6; }
+-if test "${gl_cv_type_wctype_t+set}" = set; then :
++if ${gl_cv_type_wctype_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -31259,7 +31274,7 @@ $as_echo "$gl_cv_type_wctype_t" >&6; }
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
+ $as_echo_n "checking for wctrans_t... " >&6; }
+-if test "${gl_cv_type_wctrans_t+set}" = set; then :
++if ${gl_cv_type_wctrans_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -31305,7 +31320,7 @@ $as_echo "$gl_cv_type_wctrans_t" >&6; }
+   for ac_header in stdint.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdint_h" = x""yes; then :
++if test "x$ac_cv_header_stdint_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STDINT_H 1
+ _ACEOF
+@@ -31362,7 +31377,7 @@ done
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5
+ $as_echo_n "checking whether btowc(0) is correct... " >&6; }
+-if test "${gl_cv_func_btowc_nul+set}" = set; then :
++if ${gl_cv_func_btowc_nul+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31411,7 +31426,7 @@ $as_echo "$gl_cv_func_btowc_nul" >&6; }
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5
+ $as_echo_n "checking whether btowc(EOF) is correct... " >&6; }
+-if test "${gl_cv_func_btowc_eof+set}" = set; then :
++if ${gl_cv_func_btowc_eof+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31514,7 +31529,7 @@ $as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31646,7 +31661,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31773,7 +31788,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -31906,7 +31921,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a turkish Unicode locale" >&5
+ $as_echo_n "checking for a turkish Unicode locale... " >&6; }
+-if test "${gt_cv_locale_tr_utf8+set}" = set; then :
++if ${gt_cv_locale_tr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -32041,7 +32056,7 @@ $as_echo "$gt_cv_locale_tr_utf8" >&6; }
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+ $as_echo_n "checking for error_at_line... " >&6; }
+-if test "${ac_cv_lib_error_at_line+set}" = set; then :
++if ${ac_cv_lib_error_at_line+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -32124,7 +32139,7 @@ $as_echo "#define GETGROUPS_ZERO_BUG 1" >>confdefs.h
+   else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getgroups handles negative values" >&5
+ $as_echo_n "checking whether getgroups handles negative values... " >&6; }
+-if test "${gl_cv_func_getgroups_works+set}" = set; then :
++if ${gl_cv_func_getgroups_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -32200,7 +32215,7 @@ $as_echo "#define GNULIB_TEST_GETGROUPS 1" >>confdefs.h
+   for ac_func in getpagesize
+ do :
+   ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+-if test "x$ac_cv_func_getpagesize" = x""yes; then :
++if test "x$ac_cv_func_getpagesize" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETPAGESIZE 1
+ _ACEOF
+@@ -32213,7 +32228,7 @@ done
+     for ac_header in OS.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_includes_default"
+-if test "x$ac_cv_header_OS_h" = x""yes; then :
++if test "x$ac_cv_header_OS_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_OS_H 1
+ _ACEOF
+@@ -32228,7 +32243,7 @@ done
+     for ac_header in sys/param.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_param_h" = x""yes; then :
++if test "x$ac_cv_header_sys_param_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SYS_PARAM_H 1
+ _ACEOF
+@@ -32247,7 +32262,7 @@ done
+       ;;
+   esac
+       ac_fn_c_check_decl "$LINENO" "getpagesize" "ac_cv_have_decl_getpagesize" "$ac_includes_default"
+-if test "x$ac_cv_have_decl_getpagesize" = x""yes; then :
++if test "x$ac_cv_have_decl_getpagesize" = xyes; then :
+ 
+ else
+   HAVE_DECL_GETPAGESIZE=0
+@@ -32332,7 +32347,7 @@ $as_echo "#define GNULIB_TEST_GETSOCKOPT 1" >>confdefs.h
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if test "${ac_cv_c_bigendian+set}" = set; then :
++if ${ac_cv_c_bigendian+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_bigendian=unknown
+@@ -32556,7 +32571,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if test "${ac_cv_c_bigendian+set}" = set; then :
++if ${ac_cv_c_bigendian+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_bigendian=unknown
+@@ -32782,7 +32797,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5
+ $as_echo_n "checking whether the compiler generally respects inline... " >&6; }
+-if test "${gl_cv_c_inline_effective+set}" = set; then :
++if ${gl_cv_c_inline_effective+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test $ac_cv_c_inline = no; then
+@@ -32859,7 +32874,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether INT32_MAX < INTMAX_MAX" >&5
+ $as_echo_n "checking whether INT32_MAX < INTMAX_MAX... " >&6; }
+-if test "${gl_cv_test_INT32_MAX_LT_INTMAX_MAX+set}" = set; then :
++if ${gl_cv_test_INT32_MAX_LT_INTMAX_MAX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -32911,7 +32926,7 @@ $as_echo "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether INT64_MAX == LONG_MAX" >&5
+ $as_echo_n "checking whether INT64_MAX == LONG_MAX... " >&6; }
+-if test "${gl_cv_test_INT64_MAX_EQ_LONG_MAX+set}" = set; then :
++if ${gl_cv_test_INT64_MAX_EQ_LONG_MAX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -32965,7 +32980,7 @@ $as_echo "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UINT32_MAX < UINTMAX_MAX" >&5
+ $as_echo_n "checking whether UINT32_MAX < UINTMAX_MAX... " >&6; }
+-if test "${gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX+set}" = set; then :
++if ${gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -33017,7 +33032,7 @@ $as_echo "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UINT64_MAX == ULONG_MAX" >&5
+ $as_echo_n "checking whether UINT64_MAX == ULONG_MAX... " >&6; }
+-if test "${gl_cv_test_UINT64_MAX_EQ_ULONG_MAX+set}" = set; then :
++if ${gl_cv_test_UINT64_MAX_EQ_ULONG_MAX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -33080,7 +33095,7 @@ $as_echo "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
+ $as_echo_n "checking whether locale.h conforms to POSIX:2001... " >&6; }
+-if test "${gl_cv_header_locale_h_posix2001+set}" = set; then :
++if ${gl_cv_header_locale_h_posix2001+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -33116,7 +33131,7 @@ $as_echo "$gl_cv_header_locale_h_posix2001" >&6; }
+     HAVE_XLOCALE_H=1
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
+ $as_echo_n "checking whether locale.h defines locale_t... " >&6; }
+-if test "${gl_cv_header_locale_has_locale_t+set}" = set; then :
++if ${gl_cv_header_locale_has_locale_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -33165,7 +33180,7 @@ $as_echo "$gl_cv_header_locale_has_locale_t" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
+ $as_echo_n "checking absolute name of <locale.h>... " >&6; }
+-if test "${gl_cv_next_locale_h+set}" = set; then :
++if ${gl_cv_next_locale_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -33243,7 +33258,7 @@ done
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -33375,7 +33390,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -33502,7 +33517,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+ $as_echo_n "checking for a traditional japanese locale... " >&6; }
+-if test "${gt_cv_locale_ja+set}" = set; then :
++if ${gt_cv_locale_ja+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -33640,7 +33655,7 @@ $as_echo "$gt_cv_locale_ja" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+ $as_echo_n "checking for a transitional chinese locale... " >&6; }
+-if test "${gt_cv_locale_zh_CN+set}" = set; then :
++if ${gt_cv_locale_zh_CN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -33772,7 +33787,7 @@ $as_echo "$gt_cv_locale_zh_CN" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -33899,7 +33914,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -34031,7 +34046,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -34158,7 +34173,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+ $as_echo_n "checking for a traditional japanese locale... " >&6; }
+-if test "${gt_cv_locale_ja+set}" = set; then :
++if ${gt_cv_locale_ja+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -34296,7 +34311,7 @@ $as_echo "$gt_cv_locale_ja" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+ $as_echo_n "checking for a transitional chinese locale... " >&6; }
+-if test "${gt_cv_locale_zh_CN+set}" = set; then :
++if ${gt_cv_locale_zh_CN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -34474,7 +34489,7 @@ $as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
+   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+   # irrelevant for anonymous mappings.
+   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+-if test "x$ac_cv_func_mmap" = x""yes; then :
++if test "x$ac_cv_func_mmap" = xyes; then :
+   gl_have_mmap=yes
+ else
+   gl_have_mmap=no
+@@ -34929,7 +34944,7 @@ if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
+   for ac_header in paths.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default"
+-if test "x$ac_cv_header_paths_h" = x""yes; then :
++if test "x$ac_cv_header_paths_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_PATHS_H 1
+ _ACEOF
+@@ -34999,7 +35014,7 @@ fi
+ 
+ ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
+ "
+-if test "x$ac_cv_have_decl_program_invocation_name" = x""yes; then :
++if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -35011,7 +35026,7 @@ _ACEOF
+ 
+ ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
+ "
+-if test "x$ac_cv_have_decl_program_invocation_short_name" = x""yes; then :
++if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -35025,7 +35040,7 @@ _ACEOF
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putenv compatible with GNU and SVID" >&5
+ $as_echo_n "checking for putenv compatible with GNU and SVID... " >&6; }
+-if test "${gl_cv_func_svid_putenv+set}" = set; then :
++if ${gl_cv_func_svid_putenv+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -35113,7 +35128,7 @@ $as_echo "#define GNULIB_TEST_PUTENV 1" >>confdefs.h
+   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+   # irrelevant for anonymous mappings.
+   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+-if test "x$ac_cv_func_mmap" = x""yes; then :
++if test "x$ac_cv_func_mmap" = xyes; then :
+   gl_have_mmap=yes
+ else
+   gl_have_mmap=no
+@@ -35232,7 +35247,7 @@ $as_echo "#define GNULIB_TEST_READ 1" >>confdefs.h
+     for ac_header in stdlib.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
++if test "x$ac_cv_header_stdlib_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STDLIB_H 1
+ _ACEOF
+@@ -35243,7 +35258,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+ $as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then :
++if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -35322,7 +35337,7 @@ _ACEOF
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv validates arguments" >&5
+ $as_echo_n "checking whether setenv validates arguments... " >&6; }
+-if test "${gl_cv_func_setenv_works+set}" = set; then :
++if ${gl_cv_func_setenv_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -35461,7 +35476,7 @@ $as_echo "#define GNULIB_TEST_SETLOCALE 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -35593,7 +35608,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -35720,7 +35735,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+ $as_echo_n "checking for a traditional japanese locale... " >&6; }
+-if test "${gt_cv_locale_ja+set}" = set; then :
++if ${gt_cv_locale_ja+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -35858,7 +35873,7 @@ $as_echo "$gt_cv_locale_ja" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+ $as_echo_n "checking for a transitional chinese locale... " >&6; }
+-if test "${gt_cv_locale_zh_CN+set}" = set; then :
++if ${gt_cv_locale_zh_CN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -36016,7 +36031,7 @@ $as_echo "$gt_cv_locale_zh_CN" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <spawn.h>" >&5
+ $as_echo_n "checking absolute name of <spawn.h>... " >&6; }
+-if test "${gl_cv_next_spawn_h+set}" = set; then :
++if ${gl_cv_next_spawn_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -36069,7 +36084,7 @@ $as_echo "$gl_cv_next_spawn_h" >&6; }
+ #include <spawn.h>
+ 
+ "
+-if test "x$ac_cv_type_posix_spawnattr_t" = x""yes; then :
++if test "x$ac_cv_type_posix_spawnattr_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_POSIX_SPAWNATTR_T 1
+@@ -36084,7 +36099,7 @@ fi
+ #include <spawn.h>
+ 
+ "
+-if test "x$ac_cv_type_posix_spawn_file_actions_t" = x""yes; then :
++if test "x$ac_cv_type_posix_spawn_file_actions_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1
+@@ -36122,7 +36137,7 @@ fi
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "#include <sys/types.h>
+      #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
+@@ -36130,7 +36145,7 @@ _ACEOF
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
+ $as_echo_n "checking whether struct stat.st_atim is of type struct timespec... " >&6; }
+-if test "${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+set}" = set; then :
++if ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -36173,7 +36188,7 @@ else
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h>
+         #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1
+@@ -36184,7 +36199,7 @@ else
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h>
+            #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_atimensec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
+@@ -36195,7 +36210,7 @@ else
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h>
+               #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1
+@@ -36224,7 +36239,7 @@ fi
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "#include <sys/types.h>
+      #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
+@@ -36235,7 +36250,7 @@ else
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h>
+         #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
+@@ -36246,7 +36261,7 @@ else
+   ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h>
+           #include <sys/stat.h>
+ "
+-if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1
+@@ -36263,7 +36278,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+ $as_echo_n "checking for wchar_t... " >&6; }
+-if test "${gt_cv_c_wchar_t+set}" = set; then :
++if ${gt_cv_c_wchar_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -36296,7 +36311,7 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+ $as_echo_n "checking for wint_t... " >&6; }
+-if test "${gt_cv_c_wint_t+set}" = set; then :
++if ${gt_cv_c_wint_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -36341,7 +36356,7 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h
+   # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is
+   # irrelevant for anonymous mappings.
+   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+-if test "x$ac_cv_func_mmap" = x""yes; then :
++if test "x$ac_cv_func_mmap" = xyes; then :
+   gl_have_mmap=yes
+ else
+   gl_have_mmap=no
+@@ -36425,7 +36440,7 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5
+ $as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; }
+-if test "${gl_cv_func_symlink_works+set}" = set; then :
++if ${gl_cv_func_symlink_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -36519,7 +36534,7 @@ $as_echo "#define GNULIB_TEST_SYMLINK 1" >>confdefs.h
+     for ac_func in pthread_atfork
+ do :
+   ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork"
+-if test "x$ac_cv_func_pthread_atfork" = x""yes; then :
++if test "x$ac_cv_func_pthread_atfork" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_PTHREAD_ATFORK 1
+ _ACEOF
+@@ -36545,7 +36560,7 @@ done
+   for ac_func in unsetenv
+ do :
+   ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
+-if test "x$ac_cv_func_unsetenv" = x""yes; then :
++if test "x$ac_cv_func_unsetenv" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_UNSETENV 1
+ _ACEOF
+@@ -36559,7 +36574,7 @@ done
+     HAVE_UNSETENV=1
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsetenv() return type" >&5
+ $as_echo_n "checking for unsetenv() return type... " >&6; }
+-if test "${gt_cv_func_unsetenv_ret+set}" = set; then :
++if ${gt_cv_func_unsetenv_ret+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -36604,7 +36619,7 @@ $as_echo "#define VOID_UNSETENV 1" >>confdefs.h
+ 
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unsetenv obeys POSIX" >&5
+ $as_echo_n "checking whether unsetenv obeys POSIX... " >&6; }
+-if test "${gl_cv_func_unsetenv_works+set}" = set; then :
++if ${gl_cv_func_unsetenv_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -36709,7 +36724,7 @@ abs_aux_dir=`cd "$ac_aux_dir"; pwd`
+   for ac_func in waitid
+ do :
+   ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid"
+-if test "x$ac_cv_func_waitid" = x""yes; then :
++if test "x$ac_cv_func_waitid" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_WAITID 1
+ _ACEOF
+@@ -36746,7 +36761,7 @@ done
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+ $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
+-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then :
++if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -36809,7 +36824,7 @@ $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+ $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
+-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then :
++if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -36905,7 +36920,7 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+ 
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
+ $as_echo_n "checking whether wcrtomb return value is correct... " >&6; }
+-if test "${gl_cv_func_wcrtomb_retval+set}" = set; then :
++if ${gl_cv_func_wcrtomb_retval+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -37020,7 +37035,7 @@ $as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+ $as_echo_n "checking for a traditional french locale... " >&6; }
+-if test "${gt_cv_locale_fr+set}" = set; then :
++if ${gt_cv_locale_fr+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -37152,7 +37167,7 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+ $as_echo_n "checking for a french Unicode locale... " >&6; }
+-if test "${gt_cv_locale_fr_utf8+set}" = set; then :
++if ${gt_cv_locale_fr_utf8+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -37279,7 +37294,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+ $as_echo_n "checking for a traditional japanese locale... " >&6; }
+-if test "${gt_cv_locale_ja+set}" = set; then :
++if ${gt_cv_locale_ja+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -37417,7 +37432,7 @@ $as_echo "$gt_cv_locale_ja" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+ $as_echo_n "checking for a transitional chinese locale... " >&6; }
+-if test "${gt_cv_locale_zh_CN+set}" = set; then :
++if ${gt_cv_locale_zh_CN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -37565,7 +37580,7 @@ $as_echo "$gt_cv_locale_zh_CN" >&6; }
+ 
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wctob works" >&5
+ $as_echo_n "checking whether wctob works... " >&6; }
+-if test "${gl_cv_func_wctob_works+set}" = set; then :
++if ${gl_cv_func_wctob_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -37680,7 +37695,7 @@ $as_echo "$gl_cv_func_wctob_works" >&6; }
+ #include <wchar.h>
+ 
+ "
+-if test "x$ac_cv_have_decl_wctob" = x""yes; then :
++if test "x$ac_cv_have_decl_wctob" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -37842,7 +37857,7 @@ $as_echo "#define GNULIB_TEST_WRITE 1" >>confdefs.h
+   if test $gl_threads_api = posix; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+ $as_echo_n "checking for sched_yield in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
++if ${ac_cv_lib_rt_sched_yield+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -37876,12 +37891,12 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
+ $as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
+-if test "x$ac_cv_lib_rt_sched_yield" = x""yes; then :
++if test "x$ac_cv_lib_rt_sched_yield" = xyes; then :
+   YIELD_LIB=-lrt
+ else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+ $as_echo_n "checking for sched_yield in -lposix4... " >&6; }
+-if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then :
++if ${ac_cv_lib_posix4_sched_yield+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -37915,7 +37930,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
+ $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; }
+-if test "x$ac_cv_lib_posix4_sched_yield" = x""yes; then :
++if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then :
+   YIELD_LIB=-lposix4
+ fi
+ 
+@@ -37940,7 +37955,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+ $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+-if test "${ac_cv_type_uid_t+set}" = set; then :
++if ${ac_cv_type_uid_t+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -37996,7 +38011,7 @@ fi
+ for ac_header in string.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
+-if test "x$ac_cv_header_string_h" = x""yes; then :
++if test "x$ac_cv_header_string_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRING_H 1
+ _ACEOF
+@@ -38017,7 +38032,7 @@ case $host in
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AS+set}" = set; then :
++if ${ac_cv_prog_AS+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AS"; then
+@@ -38057,7 +38072,7 @@ if test -z "$ac_cv_prog_AS"; then
+ set dummy as; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
++if ${ac_cv_prog_ac_ct_AS+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_AS"; then
+@@ -38109,7 +38124,7 @@ fi
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
++if ${ac_cv_prog_DLLTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DLLTOOL"; then
+@@ -38149,7 +38164,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+ set dummy dlltool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DLLTOOL"; then
+@@ -38201,7 +38216,7 @@ fi
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OBJDUMP"; then
+@@ -38241,7 +38256,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -38408,7 +38423,7 @@ esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then :
++if ${ac_cv_path_SED+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -38490,7 +38505,7 @@ Xsed="$SED -e 1s/^X//"
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if test "${ac_cv_path_FGREP+set}" = set; then :
++if ${ac_cv_path_FGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -38621,7 +38636,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -38661,7 +38676,7 @@ fi
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -38688,7 +38703,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then :
++if ${lt_cv_path_NM+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NM"; then
+@@ -38751,7 +38766,7 @@ else
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_DUMPBIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DUMPBIN"; then
+@@ -38795,7 +38810,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DUMPBIN"; then
+@@ -38867,7 +38882,7 @@ test -z "$NM" && NM=nm
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if test "${lt_cv_nm_interface+set}" = set; then :
++if ${lt_cv_nm_interface+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_nm_interface="BSD nm"
+@@ -38902,7 +38917,7 @@ fi
+ # find the maximum length of command line arguments
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
++if ${lt_cv_sys_max_cmd_len+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+     i=0
+@@ -39099,7 +39114,7 @@ esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then :
++if ${lt_cv_ld_reload_flag+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+@@ -39135,7 +39150,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OBJDUMP"; then
+@@ -39175,7 +39190,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -39231,7 +39246,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then :
++if ${lt_cv_deplibs_check_method+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -39453,7 +39468,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then :
++if ${ac_cv_prog_AR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AR"; then
+@@ -39493,7 +39508,7 @@ if test -z "$ac_cv_prog_AR"; then
+ set dummy ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_AR"; then
+@@ -39558,7 +39573,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -39598,7 +39613,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -39657,7 +39672,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -39697,7 +39712,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -39826,7 +39841,7 @@ compiler=$CC
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -40197,7 +40212,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   CFLAGS="$CFLAGS -belf"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then :
++if ${lt_cv_cc_needs_belf+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_ext=c
+@@ -40273,7 +40288,7 @@ need_locks="$enable_libtool_lock"
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_DSYMUTIL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DSYMUTIL"; then
+@@ -40313,7 +40328,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+ set dummy dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DSYMUTIL"; then
+@@ -40365,7 +40380,7 @@ fi
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_NMEDIT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NMEDIT"; then
+@@ -40405,7 +40420,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+ set dummy nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_NMEDIT"; then
+@@ -40457,7 +40472,7 @@ fi
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LIPO+set}" = set; then :
++if ${ac_cv_prog_LIPO+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LIPO"; then
+@@ -40497,7 +40512,7 @@ if test -z "$ac_cv_prog_LIPO"; then
+ set dummy lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_LIPO"; then
+@@ -40549,7 +40564,7 @@ fi
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL+set}" = set; then :
++if ${ac_cv_prog_OTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL"; then
+@@ -40589,7 +40604,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
+ set dummy otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL"; then
+@@ -40641,7 +40656,7 @@ fi
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_OTOOL64+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL64"; then
+@@ -40681,7 +40696,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+ set dummy otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL64"; then
+@@ -40756,7 +40771,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
++if ${lt_cv_apple_cc_single_mod+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_apple_cc_single_mod=no
+@@ -40785,7 +40800,7 @@ fi
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
++if ${lt_cv_ld_exported_symbols_list+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_exported_symbols_list=no
+@@ -40817,7 +40832,7 @@ fi
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+ $as_echo_n "checking for -force_load linker flag... " >&6; }
+-if test "${lt_cv_ld_force_load+set}" = set; then :
++if ${lt_cv_ld_force_load+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_force_load=no
+@@ -40886,7 +40901,7 @@ for ac_header in dlfcn.h
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ "
+-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLFCN_H 1
+ _ACEOF
+@@ -41071,7 +41086,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if test "${lt_cv_objdir+set}" = set; then :
++if ${lt_cv_objdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f .libs 2>/dev/null
+@@ -41149,7 +41164,7 @@ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -41215,7 +41230,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -41357,7 +41372,7 @@ if test "$GCC" = yes; then
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+@@ -41709,7 +41724,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+ if test -n "$lt_prog_compiler_pic"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works=no
+@@ -41768,7 +41783,7 @@ fi
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works=no
+@@ -41811,7 +41826,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -41866,7 +41881,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -42686,7 +42701,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+ $as_echo_n "checking if $CC understands -b... " >&6; }
+-if test "${lt_cv_prog_compiler__b+set}" = set; then :
++if ${lt_cv_prog_compiler__b+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler__b=no
+@@ -43058,7 +43073,7 @@ x|xyes)
+       # to ld, don't add -lc before -lgcc.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
++if ${lt_cv_archive_cmds_need_lc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   $RM conftest*
+@@ -43700,7 +43715,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   shlibpath_overrides_runpath=no
+ 
+   # Some binutils ld are patched to set DT_RUNPATH
+-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_shlibpath_overrides_runpath=no
+@@ -44124,7 +44139,7 @@ else
+   # if libdl is installed we need to link against it
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -44158,7 +44173,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ 
+@@ -44172,12 +44187,12 @@ fi
+ 
+   *)
+     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+-if test "x$ac_cv_func_shl_load" = x""yes; then :
++if test "x$ac_cv_func_shl_load" = xyes; then :
+   lt_cv_dlopen="shl_load"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++if ${ac_cv_lib_dld_shl_load+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -44211,16 +44226,16 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = x""yes; then :
++if test "x$ac_cv_func_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -44254,12 +44269,12 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
++if ${ac_cv_lib_svld_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -44293,12 +44308,12 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
++if ${ac_cv_lib_dld_dld_link+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -44332,7 +44347,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+ 
+@@ -44373,7 +44388,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then :
++if ${lt_cv_dlopen_self+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -44479,7 +44494,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
+       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then :
++if ${lt_cv_dlopen_self_static+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -44788,7 +44803,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -44828,7 +44843,7 @@ fi
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -44927,7 +44942,7 @@ fi
+ 
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is supported" >&5
+ $as_echo_n "checking whether -Wno-missing-field-initializers is supported... " >&6; }
+-    if test "${gl_cv_cc_nomfi_supported+set}" = set; then :
++    if ${gl_cv_cc_nomfi_supported+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -44959,7 +44974,7 @@ $as_echo "$gl_cv_cc_nomfi_supported" >&6; }
+     if test "$gl_cv_cc_nomfi_supported" = yes; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is needed" >&5
+ $as_echo_n "checking whether -Wno-missing-field-initializers is needed... " >&6; }
+-      if test "${gl_cv_cc_nomfi_needed+set}" = set; then :
++      if ${gl_cv_cc_nomfi_needed+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45096,7 +45111,7 @@ $as_echo "$gl_cv_cc_nomfi_needed" >&6; }
+           as_gl_Warn=`$as_echo "gl_cv_warn_$w" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles $w" >&5
+ $as_echo_n "checking whether compiler handles $w... " >&6; }
+-if eval "test \"\${$as_gl_Warn+set}\"" = set; then :
++if eval \${$as_gl_Warn+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45118,7 +45133,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   eval "$as_gl_Warn=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+@@ -45137,7 +45152,7 @@ fi
+         # So we have -W enabled, and then have to explicitly turn off...
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Wno-sign-compare" >&5
+ $as_echo_n "checking whether compiler handles -Wno-sign-compare... " >&6; }
+-if test "${gl_cv_warn__Wno_sign_compare+set}" = set; then :
++if ${gl_cv_warn__Wno_sign_compare+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45159,13 +45174,13 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__Wno_sign_compare=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__Wno_sign_compare" >&5
+ $as_echo "$gl_cv_warn__Wno_sign_compare" >&6; }
+-if test "x$gl_cv_warn__Wno_sign_compare" = x""yes; then :
++if test "x$gl_cv_warn__Wno_sign_compare" = xyes; then :
+   as_fn_append WARN_CFLAGS " -Wno-sign-compare"
+ fi
+ 
+@@ -45174,7 +45189,7 @@ fi
+         # that one off, so we need to manually enable this again
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Wjump-misses-init" >&5
+ $as_echo_n "checking whether compiler handles -Wjump-misses-init... " >&6; }
+-if test "${gl_cv_warn__Wjump_misses_init+set}" = set; then :
++if ${gl_cv_warn__Wjump_misses_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45196,13 +45211,13 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__Wjump_misses_init=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__Wjump_misses_init" >&5
+ $as_echo "$gl_cv_warn__Wjump_misses_init" >&6; }
+-if test "x$gl_cv_warn__Wjump_misses_init" = x""yes; then :
++if test "x$gl_cv_warn__Wjump_misses_init" = xyes; then :
+   as_fn_append WARN_CFLAGS " -Wjump-misses-init"
+ fi
+ 
+@@ -45213,7 +45228,7 @@ fi
+         as_gl_Warn=`$as_echo "gl_cv_warn_-Wframe-larger-than=4096" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Wframe-larger-than=4096" >&5
+ $as_echo_n "checking whether compiler handles -Wframe-larger-than=4096... " >&6; }
+-if eval "test \"\${$as_gl_Warn+set}\"" = set; then :
++if eval \${$as_gl_Warn+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45235,7 +45250,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   eval "$as_gl_Warn=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+@@ -45251,7 +45266,7 @@ fi
+         as_gl_Warn=`$as_echo "gl_cv_warn_-Wp,-D_FORTIFY_SOURCE=2" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Wp,-D_FORTIFY_SOURCE=2" >&5
+ $as_echo_n "checking whether compiler handles -Wp,-D_FORTIFY_SOURCE=2... " >&6; }
+-if eval "test \"\${$as_gl_Warn+set}\"" = set; then :
++if eval \${$as_gl_Warn+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45273,7 +45288,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   eval "$as_gl_Warn=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+@@ -45288,7 +45303,7 @@ fi
+            *-*-linux*)
+                                             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -fstack-protector-all" >&5
+ $as_echo_n "checking whether compiler handles -fstack-protector-all... " >&6; }
+-if test "${gl_cv_warn__fstack_protector_all+set}" = set; then :
++if ${gl_cv_warn__fstack_protector_all+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45310,20 +45325,20 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__fstack_protector_all=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__fstack_protector_all" >&5
+ $as_echo "$gl_cv_warn__fstack_protector_all" >&6; }
+-if test "x$gl_cv_warn__fstack_protector_all" = x""yes; then :
++if test "x$gl_cv_warn__fstack_protector_all" = xyes; then :
+   as_fn_append WARN_CFLAGS " -fstack-protector-all"
+ fi
+ 
+            as_gl_Warn=`$as_echo "gl_cv_warn_--param=ssp-buffer-size=4" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles --param=ssp-buffer-size=4" >&5
+ $as_echo_n "checking whether compiler handles --param=ssp-buffer-size=4... " >&6; }
+-if eval "test \"\${$as_gl_Warn+set}\"" = set; then :
++if eval \${$as_gl_Warn+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45345,7 +45360,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   eval "$as_gl_Warn=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+@@ -45360,7 +45375,7 @@ fi
+         esac
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -fexceptions" >&5
+ $as_echo_n "checking whether compiler handles -fexceptions... " >&6; }
+-if test "${gl_cv_warn__fexceptions+set}" = set; then :
++if ${gl_cv_warn__fexceptions+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45382,19 +45397,19 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__fexceptions=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__fexceptions" >&5
+ $as_echo "$gl_cv_warn__fexceptions" >&6; }
+-if test "x$gl_cv_warn__fexceptions" = x""yes; then :
++if test "x$gl_cv_warn__fexceptions" = xyes; then :
+   as_fn_append WARN_CFLAGS " -fexceptions"
+ fi
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -fasynchronous-unwind-tables" >&5
+ $as_echo_n "checking whether compiler handles -fasynchronous-unwind-tables... " >&6; }
+-if test "${gl_cv_warn__fasynchronous_unwind_tables+set}" = set; then :
++if ${gl_cv_warn__fasynchronous_unwind_tables+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45416,19 +45431,19 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__fasynchronous_unwind_tables=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__fasynchronous_unwind_tables" >&5
+ $as_echo "$gl_cv_warn__fasynchronous_unwind_tables" >&6; }
+-if test "x$gl_cv_warn__fasynchronous_unwind_tables" = x""yes; then :
++if test "x$gl_cv_warn__fasynchronous_unwind_tables" = xyes; then :
+   as_fn_append WARN_CFLAGS " -fasynchronous-unwind-tables"
+ fi
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -fdiagnostics-show-option" >&5
+ $as_echo_n "checking whether compiler handles -fdiagnostics-show-option... " >&6; }
+-if test "${gl_cv_warn__fdiagnostics_show_option+set}" = set; then :
++if ${gl_cv_warn__fdiagnostics_show_option+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45450,19 +45465,19 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__fdiagnostics_show_option=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__fdiagnostics_show_option" >&5
+ $as_echo "$gl_cv_warn__fdiagnostics_show_option" >&6; }
+-if test "x$gl_cv_warn__fdiagnostics_show_option" = x""yes; then :
++if test "x$gl_cv_warn__fdiagnostics_show_option" = xyes; then :
+   as_fn_append WARN_CFLAGS " -fdiagnostics-show-option"
+ fi
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -funit-at-a-time" >&5
+ $as_echo_n "checking whether compiler handles -funit-at-a-time... " >&6; }
+-if test "${gl_cv_warn__funit_at_a_time+set}" = set; then :
++if ${gl_cv_warn__funit_at_a_time+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45484,13 +45499,13 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__funit_at_a_time=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__funit_at_a_time" >&5
+ $as_echo "$gl_cv_warn__funit_at_a_time" >&6; }
+-if test "x$gl_cv_warn__funit_at_a_time" = x""yes; then :
++if test "x$gl_cv_warn__funit_at_a_time" = xyes; then :
+   as_fn_append WARN_CFLAGS " -funit-at-a-time"
+ fi
+ 
+@@ -45499,7 +45514,7 @@ fi
+         then
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Werror" >&5
+ $as_echo_n "checking whether compiler handles -Werror... " >&6; }
+-if test "${gl_cv_warn__Werror+set}" = set; then :
++if ${gl_cv_warn__Werror+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45521,13 +45536,13 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__Werror=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__Werror" >&5
+ $as_echo "$gl_cv_warn__Werror" >&6; }
+-if test "x$gl_cv_warn__Werror" = x""yes; then :
++if test "x$gl_cv_warn__Werror" = xyes; then :
+   as_fn_append WARN_CFLAGS " -Werror"
+ fi
+ 
+@@ -45546,7 +45561,7 @@ fi
+     WARN_CFLAGS=
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -Wno-redundant-decls" >&5
+ $as_echo_n "checking whether compiler handles -Wno-redundant-decls... " >&6; }
+-if test "${gl_cv_warn__Wno_redundant_decls+set}" = set; then :
++if ${gl_cv_warn__Wno_redundant_decls+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -45568,13 +45583,13 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__Wno_redundant_decls=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__Wno_redundant_decls" >&5
+ $as_echo "$gl_cv_warn__Wno_redundant_decls" >&6; }
+-if test "x$gl_cv_warn__Wno_redundant_decls" = x""yes; then :
++if test "x$gl_cv_warn__Wno_redundant_decls" = xyes; then :
+   as_fn_append WARN_CFLAGS " -Wno-redundant-decls"
+ fi
+ 
+@@ -45626,7 +45641,7 @@ $as_echo "$have_cpuid" >&6; }
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+ $as_echo_n "checking size of long... " >&6; }
+-if test "${ac_cv_sizeof_long+set}" = set; then :
++if ${ac_cv_sizeof_long+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+@@ -45654,6 +45669,205 @@ _ACEOF
+ 
+ 
+ 
++# Check whether --enable-largefile was given.
++if test "${enable_largefile+set}" = set; then :
++  enableval=$enable_largefile;
++fi
++
++if test "$enable_largefile" != no; then
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
++$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
++if ${ac_cv_sys_largefile_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_sys_largefile_CC=no
++     if test "$GCC" != yes; then
++       ac_save_CC=$CC
++       while :; do
++	 # IRIX 6.2 and later do not support large files by default,
++	 # so use the C compiler's -n32 option if that helps.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++	 if ac_fn_c_try_compile "$LINENO"; then :
++  break
++fi
++rm -f core conftest.err conftest.$ac_objext
++	 CC="$CC -n32"
++	 if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_largefile_CC=' -n32'; break
++fi
++rm -f core conftest.err conftest.$ac_objext
++	 break
++       done
++       CC=$ac_save_CC
++       rm -f conftest.$ac_ext
++    fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
++$as_echo "$ac_cv_sys_largefile_CC" >&6; }
++  if test "$ac_cv_sys_largefile_CC" != no; then
++    CC=$CC$ac_cv_sys_largefile_CC
++  fi
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
++if ${ac_cv_sys_file_offset_bits+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  while :; do
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_file_offset_bits=no; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#define _FILE_OFFSET_BITS 64
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_file_offset_bits=64; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_file_offset_bits=unknown
++  break
++done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
++$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
++case $ac_cv_sys_file_offset_bits in #(
++  no | unknown) ;;
++  *)
++cat >>confdefs.h <<_ACEOF
++#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
++_ACEOF
++;;
++esac
++rm -rf conftest*
++  if test $ac_cv_sys_file_offset_bits = unknown; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
++$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
++if ${ac_cv_sys_large_files+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  while :; do
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_large_files=no; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#define _LARGE_FILES 1
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_large_files=1; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_large_files=unknown
++  break
++done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
++$as_echo "$ac_cv_sys_large_files" >&6; }
++case $ac_cv_sys_large_files in #(
++  no | unknown) ;;
++  *)
++cat >>confdefs.h <<_ACEOF
++#define _LARGE_FILES $ac_cv_sys_large_files
++_ACEOF
++;;
++esac
++rm -rf conftest*
++  fi
++fi
++
++
+ 
+ 
+ 
+@@ -45776,7 +45990,7 @@ LIBS="$LIBS $LIB_PTHREAD"
+ for ac_func in pthread_mutexattr_init
+ do :
+   ac_fn_c_check_func "$LINENO" "pthread_mutexattr_init" "ac_cv_func_pthread_mutexattr_init"
+-if test "x$ac_cv_func_pthread_mutexattr_init" = x""yes; then :
++if test "x$ac_cv_func_pthread_mutexattr_init" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_PTHREAD_MUTEXATTR_INIT 1
+ _ACEOF
+@@ -45813,7 +46027,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
+ $as_echo_n "checking for gettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_gettext+set}" = set; then :
++if ${ac_cv_lib_intl_gettext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -45847,7 +46061,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5
+ $as_echo "$ac_cv_lib_intl_gettext" >&6; }
+-if test "x$ac_cv_lib_intl_gettext" = x""yes; then :
++if test "x$ac_cv_lib_intl_gettext" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBINTL 1
+ _ACEOF
+@@ -45861,7 +46075,7 @@ fi
+ set dummy rpcgen; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_RPCGEN+set}" = set; then :
++if ${ac_cv_path_RPCGEN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $RPCGEN in
+@@ -45920,7 +46134,7 @@ fi
+ set dummy xmllint; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XMLLINT+set}" = set; then :
++if ${ac_cv_path_XMLLINT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $XMLLINT in
+@@ -45961,7 +46175,7 @@ fi
+ set dummy xmlcatalog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XMLCATALOG+set}" = set; then :
++if ${ac_cv_path_XMLCATALOG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $XMLCATALOG in
+@@ -46002,7 +46216,7 @@ fi
+ set dummy xsltproc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XSLTPROC+set}" = set; then :
++if ${ac_cv_path_XSLTPROC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $XSLTPROC in
+@@ -46043,7 +46257,7 @@ fi
+ set dummy augparse; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_AUGPARSE+set}" = set; then :
++if ${ac_cv_path_AUGPARSE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $AUGPARSE in
+@@ -46086,7 +46300,7 @@ fi
+ set dummy dnsmasq; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_DNSMASQ+set}" = set; then :
++if ${ac_cv_path_DNSMASQ+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $DNSMASQ in
+@@ -46128,7 +46342,7 @@ fi
+ set dummy radvd; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_RADVD+set}" = set; then :
++if ${ac_cv_path_RADVD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $RADVD in
+@@ -46170,7 +46384,7 @@ fi
+ set dummy brctl; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_BRCTL+set}" = set; then :
++if ${ac_cv_path_BRCTL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $BRCTL in
+@@ -46212,7 +46426,7 @@ fi
+ set dummy tc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_TC+set}" = set; then :
++if ${ac_cv_path_TC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $TC in
+@@ -46254,7 +46468,7 @@ fi
+ set dummy udevadm; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_UDEVADM+set}" = set; then :
++if ${ac_cv_path_UDEVADM+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $UDEVADM in
+@@ -46295,7 +46509,7 @@ fi
+ set dummy udevsettle; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_UDEVSETTLE+set}" = set; then :
++if ${ac_cv_path_UDEVSETTLE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $UDEVSETTLE in
+@@ -46336,7 +46550,7 @@ fi
+ set dummy modprobe; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MODPROBE+set}" = set; then :
++if ${ac_cv_path_MODPROBE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MODPROBE in
+@@ -46677,7 +46891,7 @@ fi
+ set dummy ip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_IP_PATH+set}" = set; then :
++if ${ac_cv_path_IP_PATH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $IP_PATH in
+@@ -46725,7 +46939,7 @@ _ACEOF
+ set dummy iptables; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_IPTABLES_PATH+set}" = set; then :
++if ${ac_cv_path_IPTABLES_PATH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $IPTABLES_PATH in
+@@ -46773,7 +46987,7 @@ _ACEOF
+ set dummy ip6tables; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_IP6TABLES_PATH+set}" = set; then :
++if ${ac_cv_path_IP6TABLES_PATH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $IP6TABLES_PATH in
+@@ -46821,7 +47035,7 @@ _ACEOF
+ set dummy ebtables; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_EBTABLES_PATH+set}" = set; then :
++if ${ac_cv_path_EBTABLES_PATH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $EBTABLES_PATH in
+@@ -46914,7 +47128,7 @@ fi
+ if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then
+                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdrmem_create in -lportablexdr" >&5
+ $as_echo_n "checking for xdrmem_create in -lportablexdr... " >&6; }
+-if test "${ac_cv_lib_portablexdr_xdrmem_create+set}" = set; then :
++if ${ac_cv_lib_portablexdr_xdrmem_create+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -46948,7 +47162,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portablexdr_xdrmem_create" >&5
+ $as_echo "$ac_cv_lib_portablexdr_xdrmem_create" >&6; }
+-if test "x$ac_cv_lib_portablexdr_xdrmem_create" = x""yes; then :
++if test "x$ac_cv_lib_portablexdr_xdrmem_create" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPORTABLEXDR 1
+ _ACEOF
+@@ -46959,7 +47173,7 @@ else
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing xdrmem_create" >&5
+ $as_echo_n "checking for library containing xdrmem_create... " >&6; }
+-if test "${ac_cv_search_xdrmem_create+set}" = set; then :
++if ${ac_cv_search_xdrmem_create+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -46993,11 +47207,11 @@ for ac_lib in '' rpc xdr nsl tirpc; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_xdrmem_create+set}" = set; then :
++  if ${ac_cv_search_xdrmem_create+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_xdrmem_create+set}" = set; then :
++if ${ac_cv_search_xdrmem_create+:} false; then :
+ 
+ else
+   ac_cv_search_xdrmem_create=no
+@@ -47022,7 +47236,7 @@ fi
+         for ac_func in xdr_u_int64_t
+ do :
+   ac_fn_c_check_func "$LINENO" "xdr_u_int64_t" "ac_cv_func_xdr_u_int64_t"
+-if test "x$ac_cv_func_xdr_u_int64_t" = x""yes; then :
++if test "x$ac_cv_func_xdr_u_int64_t" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_XDR_U_INT64_T 1
+ _ACEOF
+@@ -47034,7 +47248,7 @@ done
+         old_CFLAGS=$CFLAGS
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find <rpc/rpc.h>" >&5
+ $as_echo_n "checking where to find <rpc/rpc.h>... " >&6; }
+-if test "${lv_cv_xdr_cflags+set}" = set; then :
++if ${lv_cv_xdr_cflags+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -47079,7 +47293,7 @@ dlfcn_found=yes
+ dlopen_found=yes
+ 
+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+ 
+ else
+   dlfcn_found=no
+@@ -47088,7 +47302,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+ $as_echo_n "checking for library containing dlopen... " >&6; }
+-if test "${ac_cv_search_dlopen+set}" = set; then :
++if ${ac_cv_search_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -47122,11 +47336,11 @@ for ac_lib in '' dl; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_dlopen+set}" = set; then :
++  if ${ac_cv_search_dlopen+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_dlopen+set}" = set; then :
++if ${ac_cv_search_dlopen+:} false; then :
+ 
+ else
+   ac_cv_search_dlopen=no
+@@ -47276,7 +47490,7 @@ if test "$with_xenapi" != "no" ; then
+     LIBS="$LIBS $LIBXENSERVER_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xen_vm_start in -lxenserver" >&5
+ $as_echo_n "checking for xen_vm_start in -lxenserver... " >&6; }
+-if test "${ac_cv_lib_xenserver_xen_vm_start+set}" = set; then :
++if ${ac_cv_lib_xenserver_xen_vm_start+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -47310,7 +47524,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xenserver_xen_vm_start" >&5
+ $as_echo "$ac_cv_lib_xenserver_xen_vm_start" >&6; }
+-if test "x$ac_cv_lib_xenserver_xen_vm_start" = x""yes; then :
++if test "x$ac_cv_lib_xenserver_xen_vm_start" = xyes; then :
+ 
+         with_xenapi=yes
+         LIBXENSERVER_LIBS="$LIBXENSERVER_LIBS -lxenserver"
+@@ -47358,7 +47572,7 @@ if test "$with_libxl" != "no" ; then
+     LIBS="$LIBS $LIBXL_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxl_domain_create_new in -lxenlight" >&5
+ $as_echo_n "checking for libxl_domain_create_new in -lxenlight... " >&6; }
+-if test "${ac_cv_lib_xenlight_libxl_domain_create_new+set}" = set; then :
++if ${ac_cv_lib_xenlight_libxl_domain_create_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -47394,7 +47608,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xenlight_libxl_domain_create_new" >&5
+ $as_echo "$ac_cv_lib_xenlight_libxl_domain_create_new" >&6; }
+-if test "x$ac_cv_lib_xenlight_libxl_domain_create_new" = x""yes; then :
++if test "x$ac_cv_lib_xenlight_libxl_domain_create_new" = xyes; then :
+ 
+         with_libxl=yes
+         LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl"
+@@ -47450,7 +47664,7 @@ if test "$with_xen" != "no" ; then
+     LIBS="$LIBS $XEN_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xs_read in -lxenstore" >&5
+ $as_echo_n "checking for xs_read in -lxenstore... " >&6; }
+-if test "${ac_cv_lib_xenstore_xs_read+set}" = set; then :
++if ${ac_cv_lib_xenstore_xs_read+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -47484,7 +47698,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xenstore_xs_read" >&5
+ $as_echo "$ac_cv_lib_xenstore_xs_read" >&6; }
+-if test "x$ac_cv_lib_xenstore_xs_read" = x""yes; then :
++if test "x$ac_cv_lib_xenstore_xs_read" = xyes; then :
+ 
+            with_xen=yes
+            XEN_LIBS="$XEN_LIBS -lxenstore"
+@@ -47593,7 +47807,7 @@ if test "$with_xen" != "yes"; then
+ fi
+ if test "$with_xen_inotify" != "no"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
++if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
+ 
+         with_xen_inotify=yes
+ 
+@@ -47630,7 +47844,7 @@ fi
+ for ac_header in linux/kvm.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "linux/kvm.h" "ac_cv_header_linux_kvm_h" "$ac_includes_default"
+-if test "x$ac_cv_header_linux_kvm_h" = x""yes; then :
++if test "x$ac_cv_header_linux_kvm_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LINUX_KVM_H 1
+ _ACEOF
+@@ -47697,7 +47911,7 @@ if test "$with_qemu" = yes; then
+   lv_wrapper_shell=
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shell that supports <> redirection" >&5
+ $as_echo_n "checking for shell that supports <> redirection... " >&6; }
+-if test "${lv_cv_wrapper_shell+set}" = set; then :
++if ${lv_cv_wrapper_shell+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -47770,13 +47984,14 @@ fi
+ 
+ 
+ 
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -47819,7 +48034,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -47916,6 +48131,7 @@ if test -n "$LIBXML_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -47932,6 +48148,7 @@ if test -n "$LIBXML_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -47951,9 +48168,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1`
++	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1`
+         else
+-	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1`
++	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBXML_PKG_ERRORS" >&5
+@@ -48002,7 +48219,7 @@ CFLAGS="$CFLAGS $LIBXML_CFLAGS"
+ LIBS="$LIBS $LIBXML_LIBS"
+ ac_fn_c_check_member "$LINENO" "struct _xmlURI" "query_raw" "ac_cv_member_struct__xmlURI_query_raw" "#include <libxml/uri.h>
+ "
+-if test "x$ac_cv_member_struct__xmlURI_query_raw" = x""yes; then :
++if test "x$ac_cv_member_struct__xmlURI_query_raw" = xyes; then :
+ 
+ $as_echo "#define HAVE_XMLURI_QUERY_RAW /**/" >>confdefs.h
+ 
+@@ -48030,6 +48247,7 @@ if test -n "$GNUTLS_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= $GNUTLS_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -48046,6 +48264,7 @@ if test -n "$GNUTLS_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= $GNUTLS_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -48065,9 +48284,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= $GNUTLS_REQUIRED" 2>&1`
++	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= $GNUTLS_REQUIRED" 2>&1`
+         else
+-	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= $GNUTLS_REQUIRED" 2>&1`
++	        GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= $GNUTLS_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNUTLS_PKG_ERRORS" >&5
+@@ -48089,7 +48308,7 @@ if test "$GNUTLS_FOUND" = "no"; then
+   fail=0
+   old_libs="$LIBS"
+   ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
+-if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
++if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
+ 
+ else
+   fail=1
+@@ -48098,7 +48317,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_handshake in -lgnutls" >&5
+ $as_echo_n "checking for gnutls_handshake in -lgnutls... " >&6; }
+-if test "${ac_cv_lib_gnutls_gnutls_handshake+set}" = set; then :
++if ${ac_cv_lib_gnutls_gnutls_handshake+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -48132,7 +48351,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_handshake" >&5
+ $as_echo "$ac_cv_lib_gnutls_gnutls_handshake" >&6; }
+-if test "x$ac_cv_lib_gnutls_gnutls_handshake" = x""yes; then :
++if test "x$ac_cv_lib_gnutls_gnutls_handshake" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBGNUTLS 1
+ _ACEOF
+@@ -48162,7 +48381,7 @@ CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
+ LIBS="$LIBS $GNUTLS_LIBS"
+ ac_fn_c_check_type "$LINENO" "gnutls_session" "ac_cv_type_gnutls_session" "#include <gnutls/gnutls.h>
+ "
+-if test "x$ac_cv_type_gnutls_session" = x""yes; then :
++if test "x$ac_cv_type_gnutls_session" = xyes; then :
+ 
+ $as_echo "#define GNUTLS_1_0_COMPAT /**/" >>confdefs.h
+ 
+@@ -48194,7 +48413,7 @@ if test "x$with_sasl" != "xno"; then
+   CFLAGS="$CFLAGS $SASL_CFLAGS"
+   LIBS="$LIBS $SASL_LIBS"
+   ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sasl_sasl_h" = x""yes; then :
++if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
+ 
+ else
+ 
+@@ -48209,7 +48428,7 @@ fi
+   if test "x$with_sasl" != "xno" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
+ $as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
+-if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then :
++if ${ac_cv_lib_sasl2_sasl_client_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -48243,7 +48462,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_client_init" >&5
+ $as_echo "$ac_cv_lib_sasl2_sasl_client_init" >&6; }
+-if test "x$ac_cv_lib_sasl2_sasl_client_init" = x""yes; then :
++if test "x$ac_cv_lib_sasl2_sasl_client_init" = xyes; then :
+ 
+       SASL_LIBS="$SASL_LIBS -lsasl2"
+       with_sasl=yes
+@@ -48252,7 +48471,7 @@ else
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl" >&5
+ $as_echo_n "checking for sasl_client_init in -lsasl... " >&6; }
+-if test "${ac_cv_lib_sasl_sasl_client_init+set}" = set; then :
++if ${ac_cv_lib_sasl_sasl_client_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -48286,7 +48505,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl_sasl_client_init" >&5
+ $as_echo "$ac_cv_lib_sasl_sasl_client_init" >&6; }
+-if test "x$ac_cv_lib_sasl_sasl_client_init" = x""yes; then :
++if test "x$ac_cv_lib_sasl_sasl_client_init" = xyes; then :
+ 
+         SASL_LIBS="$SASL_LIBS -lsasl"
+         with_sasl=yes
+@@ -48352,7 +48571,7 @@ if test "x$with_yajl" != "xno"; then
+   CPPFLAGS="$CPPFLAGS $YAJL_CFLAGS"
+   LIBS="$LIBS $YAJL_LIBS"
+   ac_fn_c_check_header_mongrel "$LINENO" "yajl/yajl_common.h" "ac_cv_header_yajl_yajl_common_h" "$ac_includes_default"
+-if test "x$ac_cv_header_yajl_yajl_common_h" = x""yes; then :
++if test "x$ac_cv_header_yajl_yajl_common_h" = xyes; then :
+ 
+ else
+ 
+@@ -48367,7 +48586,7 @@ fi
+   if test "x$with_yajl" != "xno" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_parse in -lyajl" >&5
+ $as_echo_n "checking for yajl_parse in -lyajl... " >&6; }
+-if test "${ac_cv_lib_yajl_yajl_parse+set}" = set; then :
++if ${ac_cv_lib_yajl_yajl_parse+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -48401,13 +48620,13 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yajl_yajl_parse" >&5
+ $as_echo "$ac_cv_lib_yajl_yajl_parse" >&6; }
+-if test "x$ac_cv_lib_yajl_yajl_parse" = x""yes; then :
++if test "x$ac_cv_lib_yajl_yajl_parse" = xyes; then :
+ 
+       YAJL_LIBS="$YAJL_LIBS -lyajl"
+       with_yajl=yes
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_tree_parse in -lyajl" >&5
+ $as_echo_n "checking for yajl_tree_parse in -lyajl... " >&6; }
+-if test "${ac_cv_lib_yajl_yajl_tree_parse+set}" = set; then :
++if ${ac_cv_lib_yajl_yajl_tree_parse+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -48441,7 +48660,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yajl_yajl_tree_parse" >&5
+ $as_echo "$ac_cv_lib_yajl_yajl_tree_parse" >&6; }
+-if test "x$ac_cv_lib_yajl_yajl_tree_parse" = x""yes; then :
++if test "x$ac_cv_lib_yajl_yajl_tree_parse" = xyes; then :
+ 
+         with_yajl2=yes
+ 
+@@ -48512,7 +48731,7 @@ if test "x$with_sanlock" != "xno"; then
+   CPPFLAGS="$CPPFLAGS $SANLOCK_CFLAGS"
+   LIBS="$LIBS $SANLOCK_LIBS"
+   ac_fn_c_check_header_mongrel "$LINENO" "sanlock.h" "ac_cv_header_sanlock_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sanlock_h" = x""yes; then :
++if test "x$ac_cv_header_sanlock_h" = xyes; then :
+ 
+ else
+ 
+@@ -48527,7 +48746,7 @@ fi
+   if test "x$with_sanlock" != "xno" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sanlock_restrict in -lsanlock" >&5
+ $as_echo_n "checking for sanlock_restrict in -lsanlock... " >&6; }
+-if test "${ac_cv_lib_sanlock_sanlock_restrict+set}" = set; then :
++if ${ac_cv_lib_sanlock_sanlock_restrict+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -48561,7 +48780,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sanlock_sanlock_restrict" >&5
+ $as_echo "$ac_cv_lib_sanlock_sanlock_restrict" >&6; }
+-if test "x$ac_cv_lib_sanlock_sanlock_restrict" = x""yes; then :
++if test "x$ac_cv_lib_sanlock_sanlock_restrict" = xyes; then :
+ 
+       SANLOCK_LIBS="$SANLOCK_LIBS -lsanlock"
+       with_sanlock=yes
+@@ -48621,7 +48840,7 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then
+ set dummy pkcheck; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKCHECK_PATH+set}" = set; then :
++if ${ac_cv_path_PKCHECK_PATH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKCHECK_PATH in
+@@ -48692,6 +48911,7 @@ if test -n "$POLKIT_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-dbus >= $POLKIT_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -48708,6 +48928,7 @@ if test -n "$POLKIT_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-dbus >= $POLKIT_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -48727,9 +48948,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-dbus >= $POLKIT_REQUIRED" 2>&1`
++	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-dbus >= $POLKIT_REQUIRED" 2>&1`
+         else
+-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-dbus >= $POLKIT_REQUIRED" 2>&1`
++	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-dbus >= $POLKIT_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$POLKIT_PKG_ERRORS" >&5
+@@ -48782,7 +49003,7 @@ _ACEOF
+       for ac_func in polkit_context_is_caller_authorized
+ do :
+   ac_fn_c_check_func "$LINENO" "polkit_context_is_caller_authorized" "ac_cv_func_polkit_context_is_caller_authorized"
+-if test "x$ac_cv_func_polkit_context_is_caller_authorized" = x""yes; then :
++if test "x$ac_cv_func_polkit_context_is_caller_authorized" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_POLKIT_CONTEXT_IS_CALLER_AUTHORIZED 1
+ _ACEOF
+@@ -48797,7 +49018,7 @@ done
+ set dummy polkit-auth; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_POLKIT_AUTH+set}" = set; then :
++if ${ac_cv_path_POLKIT_AUTH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $POLKIT_AUTH in
+@@ -48907,6 +49128,7 @@ if test -n "$AVAHI_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= $AVAHI_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -48923,6 +49145,7 @@ if test -n "$AVAHI_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-client >= $AVAHI_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -48942,9 +49165,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client >= $AVAHI_REQUIRED" 2>&1`
++	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client >= $AVAHI_REQUIRED" 2>&1`
+         else
+-	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client >= $AVAHI_REQUIRED" 2>&1`
++	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client >= $AVAHI_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$AVAHI_PKG_ERRORS" >&5
+@@ -49014,7 +49237,7 @@ if test "$with_audit" != "no" ; then
+   LIBS="$LIBS $AUDIT_LIBS"
+   fail=0
+   ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libaudit_h" = x""yes; then :
++if test "x$ac_cv_header_libaudit_h" = xyes; then :
+ 
+ else
+   fail=1
+@@ -49023,7 +49246,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_encode_nv_string in -laudit" >&5
+ $as_echo_n "checking for audit_encode_nv_string in -laudit... " >&6; }
+-if test "${ac_cv_lib_audit_audit_encode_nv_string+set}" = set; then :
++if ${ac_cv_lib_audit_audit_encode_nv_string+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49057,7 +49280,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_encode_nv_string" >&5
+ $as_echo "$ac_cv_lib_audit_audit_encode_nv_string" >&6; }
+-if test "x$ac_cv_lib_audit_audit_encode_nv_string" = x""yes; then :
++if test "x$ac_cv_lib_audit_audit_encode_nv_string" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBAUDIT 1
+ _ACEOF
+@@ -49121,7 +49344,7 @@ if test "$with_selinux" != "no"; then
+   old_libs="$LIBS"
+   if test "$with_selinux" = "check"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+-if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
++if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
+ 
+ else
+   with_selinux=no
+@@ -49130,7 +49353,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetfilecon in -lselinux" >&5
+ $as_echo_n "checking for fgetfilecon in -lselinux... " >&6; }
+-if test "${ac_cv_lib_selinux_fgetfilecon+set}" = set; then :
++if ${ac_cv_lib_selinux_fgetfilecon+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49164,7 +49387,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_fgetfilecon" >&5
+ $as_echo "$ac_cv_lib_selinux_fgetfilecon" >&6; }
+-if test "x$ac_cv_lib_selinux_fgetfilecon" = x""yes; then :
++if test "x$ac_cv_lib_selinux_fgetfilecon" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSELINUX 1
+ _ACEOF
+@@ -49181,7 +49404,7 @@ fi
+   else
+     fail=0
+     ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+-if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then :
++if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
+ 
+ else
+   fail=1
+@@ -49190,7 +49413,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetfilecon in -lselinux" >&5
+ $as_echo_n "checking for fgetfilecon in -lselinux... " >&6; }
+-if test "${ac_cv_lib_selinux_fgetfilecon+set}" = set; then :
++if ${ac_cv_lib_selinux_fgetfilecon+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49224,7 +49447,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_fgetfilecon" >&5
+ $as_echo "$ac_cv_lib_selinux_fgetfilecon" >&6; }
+-if test "x$ac_cv_lib_selinux_fgetfilecon" = x""yes; then :
++if test "x$ac_cv_lib_selinux_fgetfilecon" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSELINUX 1
+ _ACEOF
+@@ -49251,7 +49474,7 @@ _ACEOF
+       for ac_header in selinux/label.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "selinux/label.h" "ac_cv_header_selinux_label_h" "$ac_includes_default"
+-if test "x$ac_cv_header_selinux_label_h" = x""yes; then :
++if test "x$ac_cv_header_selinux_label_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SELINUX_LABEL_H 1
+ _ACEOF
+@@ -49296,14 +49519,14 @@ else
+ 
+   fail=0
+   ac_fn_c_check_func "$LINENO" "selinux_virtual_domain_context_path" "ac_cv_func_selinux_virtual_domain_context_path"
+-if test "x$ac_cv_func_selinux_virtual_domain_context_path" = x""yes; then :
++if test "x$ac_cv_func_selinux_virtual_domain_context_path" = xyes; then :
+ 
+ else
+   fail=1
+ fi
+ 
+   ac_fn_c_check_func "$LINENO" "selinux_virtual_image_context_path" "ac_cv_func_selinux_virtual_image_context_path"
+-if test "x$ac_cv_func_selinux_virtual_image_context_path" = x""yes; then :
++if test "x$ac_cv_func_selinux_virtual_image_context_path" = xyes; then :
+ 
+ else
+   fail=1
+@@ -49353,7 +49576,7 @@ if test "$with_apparmor" != "no"; then
+   old_libs="$LIBS"
+   if test "$with_apparmor" = "check"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_apparmor_h" = x""yes; then :
++if test "x$ac_cv_header_sys_apparmor_h" = xyes; then :
+ 
+ else
+   with_apparmor=no
+@@ -49362,7 +49585,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
+ $as_echo_n "checking for aa_change_profile in -lapparmor... " >&6; }
+-if test "${ac_cv_lib_apparmor_aa_change_profile+set}" = set; then :
++if ${ac_cv_lib_apparmor_aa_change_profile+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49396,7 +49619,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
+ $as_echo "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
+-if test "x$ac_cv_lib_apparmor_aa_change_profile" = x""yes; then :
++if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBAPPARMOR 1
+ _ACEOF
+@@ -49409,7 +49632,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_hat in -lapparmor" >&5
+ $as_echo_n "checking for aa_change_hat in -lapparmor... " >&6; }
+-if test "${ac_cv_lib_apparmor_aa_change_hat+set}" = set; then :
++if ${ac_cv_lib_apparmor_aa_change_hat+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49443,7 +49666,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_hat" >&5
+ $as_echo "$ac_cv_lib_apparmor_aa_change_hat" >&6; }
+-if test "x$ac_cv_lib_apparmor_aa_change_hat" = x""yes; then :
++if test "x$ac_cv_lib_apparmor_aa_change_hat" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBAPPARMOR 1
+ _ACEOF
+@@ -49460,7 +49683,7 @@ fi
+   else
+     fail=0
+     ac_fn_c_check_header_mongrel "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_apparmor_h" = x""yes; then :
++if test "x$ac_cv_header_sys_apparmor_h" = xyes; then :
+ 
+ else
+   fail=1
+@@ -49469,7 +49692,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
+ $as_echo_n "checking for aa_change_profile in -lapparmor... " >&6; }
+-if test "${ac_cv_lib_apparmor_aa_change_profile+set}" = set; then :
++if ${ac_cv_lib_apparmor_aa_change_profile+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49503,7 +49726,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
+ $as_echo "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
+-if test "x$ac_cv_lib_apparmor_aa_change_profile" = x""yes; then :
++if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBAPPARMOR 1
+ _ACEOF
+@@ -49516,7 +49739,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_hat in -lapparmor" >&5
+ $as_echo_n "checking for aa_change_hat in -lapparmor... " >&6; }
+-if test "${ac_cv_lib_apparmor_aa_change_hat+set}" = set; then :
++if ${ac_cv_lib_apparmor_aa_change_hat+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49550,7 +49773,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_hat" >&5
+ $as_echo "$ac_cv_lib_apparmor_aa_change_hat" >&6; }
+-if test "x$ac_cv_lib_apparmor_aa_change_hat" = x""yes; then :
++if test "x$ac_cv_lib_apparmor_aa_change_hat" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBAPPARMOR 1
+ _ACEOF
+@@ -49620,14 +49843,14 @@ else
+ 
+   fail=0
+   ac_fn_c_check_func "$LINENO" "change_hat" "ac_cv_func_change_hat"
+-if test "x$ac_cv_func_change_hat" = x""yes; then :
++if test "x$ac_cv_func_change_hat" = xyes; then :
+ 
+ else
+   fail=1
+ fi
+ 
+   ac_fn_c_check_func "$LINENO" "aa_change_profile" "ac_cv_func_aa_change_profile"
+-if test "x$ac_cv_func_aa_change_profile" = x""yes; then :
++if test "x$ac_cv_func_aa_change_profile" = xyes; then :
+ 
+ else
+   fail=1
+@@ -49675,7 +49898,7 @@ if test "$with_dtrace" != "no" ; then
+ set dummy dtrace; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_DTRACE+set}" = set; then :
++if ${ac_cv_path_DTRACE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $DTRACE in
+@@ -49755,7 +49978,7 @@ if test "$with_qemu" = "yes" && test "$with_numactl" != "no"; then
+   old_libs="$LIBS"
+   if test "$with_numactl" = "check"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "numa.h" "ac_cv_header_numa_h" "$ac_includes_default"
+-if test "x$ac_cv_header_numa_h" = x""yes; then :
++if test "x$ac_cv_header_numa_h" = xyes; then :
+ 
+ else
+   with_numactl=no
+@@ -49764,7 +49987,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for numa_available in -lnuma" >&5
+ $as_echo_n "checking for numa_available in -lnuma... " >&6; }
+-if test "${ac_cv_lib_numa_numa_available+set}" = set; then :
++if ${ac_cv_lib_numa_numa_available+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49798,7 +50021,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_numa_numa_available" >&5
+ $as_echo "$ac_cv_lib_numa_numa_available" >&6; }
+-if test "x$ac_cv_lib_numa_numa_available" = x""yes; then :
++if test "x$ac_cv_lib_numa_numa_available" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNUMA 1
+ _ACEOF
+@@ -49815,7 +50038,7 @@ fi
+   else
+     fail=0
+     ac_fn_c_check_header_mongrel "$LINENO" "numa.h" "ac_cv_header_numa_h" "$ac_includes_default"
+-if test "x$ac_cv_header_numa_h" = x""yes; then :
++if test "x$ac_cv_header_numa_h" = xyes; then :
+ 
+ else
+   fail=1
+@@ -49824,7 +50047,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for numa_available in -lnuma" >&5
+ $as_echo_n "checking for numa_available in -lnuma... " >&6; }
+-if test "${ac_cv_lib_numa_numa_available+set}" = set; then :
++if ${ac_cv_lib_numa_numa_available+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -49858,7 +50081,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_numa_numa_available" >&5
+ $as_echo "$ac_cv_lib_numa_numa_available" >&6; }
+-if test "x$ac_cv_lib_numa_numa_available" = x""yes; then :
++if test "x$ac_cv_lib_numa_numa_available" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNUMA 1
+ _ACEOF
+@@ -49949,7 +50172,7 @@ if test "$with_libvirtd" = "no" ; then
+ fi
+ if test "$with_uml" = "yes" || test "$with_uml" = "check"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
++if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
+ 
+         with_uml=yes
+ 
+@@ -50005,6 +50228,7 @@ if test -n "$LIBSSH2_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBSSH2_CFLAGS=`$PKG_CONFIG --cflags "libssh2 >= $LIBSSH2_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -50021,6 +50245,7 @@ if test -n "$LIBSSH2_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBSSH2_LIBS=`$PKG_CONFIG --libs "libssh2 >= $LIBSSH2_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -50040,9 +50265,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBSSH2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libssh2 >= $LIBSSH2_REQUIRED" 2>&1`
++	        LIBSSH2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2 >= $LIBSSH2_REQUIRED" 2>&1`
+         else
+-	        LIBSSH2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libssh2 >= $LIBSSH2_REQUIRED" 2>&1`
++	        LIBSSH2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2 >= $LIBSSH2_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBSSH2_PKG_ERRORS" >&5
+@@ -50114,7 +50339,7 @@ if test "$with_qemu" = "yes" && test "$with_capng" != "no"; then
+   old_libs="$LIBS"
+   if test "$with_capng" = "check"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "cap-ng.h" "ac_cv_header_cap_ng_h" "$ac_includes_default"
+-if test "x$ac_cv_header_cap_ng_h" = x""yes; then :
++if test "x$ac_cv_header_cap_ng_h" = xyes; then :
+ 
+ else
+   with_capng=no
+@@ -50123,7 +50348,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capng_updatev in -lcap-ng" >&5
+ $as_echo_n "checking for capng_updatev in -lcap-ng... " >&6; }
+-if test "${ac_cv_lib_cap_ng_capng_updatev+set}" = set; then :
++if ${ac_cv_lib_cap_ng_capng_updatev+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -50157,7 +50382,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_ng_capng_updatev" >&5
+ $as_echo "$ac_cv_lib_cap_ng_capng_updatev" >&6; }
+-if test "x$ac_cv_lib_cap_ng_capng_updatev" = x""yes; then :
++if test "x$ac_cv_lib_cap_ng_capng_updatev" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCAP_NG 1
+ _ACEOF
+@@ -50174,7 +50399,7 @@ fi
+   else
+     fail=0
+     ac_fn_c_check_header_mongrel "$LINENO" "cap-ng.h" "ac_cv_header_cap_ng_h" "$ac_includes_default"
+-if test "x$ac_cv_header_cap_ng_h" = x""yes; then :
++if test "x$ac_cv_header_cap_ng_h" = xyes; then :
+ 
+ else
+   fail=1
+@@ -50183,7 +50408,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capng_updatev in -lcap-ng" >&5
+ $as_echo_n "checking for capng_updatev in -lcap-ng... " >&6; }
+-if test "${ac_cv_lib_cap_ng_capng_updatev+set}" = set; then :
++if ${ac_cv_lib_cap_ng_capng_updatev+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -50217,7 +50442,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_ng_capng_updatev" >&5
+ $as_echo "$ac_cv_lib_cap_ng_capng_updatev" >&6; }
+-if test "x$ac_cv_lib_cap_ng_capng_updatev" = x""yes; then :
++if test "x$ac_cv_lib_cap_ng_capng_updatev" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCAP_NG 1
+ _ACEOF
+@@ -50258,7 +50483,7 @@ fi
+ for ac_header in readline/readline.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+-if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
++if test "x$ac_cv_header_readline_readline_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_READLINE_READLINE_H 1
+ _ACEOF
+@@ -50271,7 +50496,7 @@ done
+ # Check for readline.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ $as_echo_n "checking for readline in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_readline+set}" = set; then :
++if ${ac_cv_lib_readline_readline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -50305,7 +50530,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+ $as_echo "$ac_cv_lib_readline_readline" >&6; }
+-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
++if test "x$ac_cv_lib_readline_readline" = xyes; then :
+   lv_use_readline=yes; VIRSH_LIBS="$VIRSH_LIBS -lreadline"
+ else
+   lv_use_readline=no
+@@ -50320,7 +50545,7 @@ if test $lv_use_readline = no; then
+     LIBS=
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+ $as_echo_n "checking for library containing tgetent... " >&6; }
+-if test "${ac_cv_search_tgetent+set}" = set; then :
++if ${ac_cv_search_tgetent+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -50354,11 +50579,11 @@ for ac_lib in '' ncurses curses termcap termlib; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_tgetent+set}" = set; then :
++  if ${ac_cv_search_tgetent+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_tgetent+set}" = set; then :
++if ${ac_cv_search_tgetent+:} false; then :
+ 
+ else
+   ac_cv_search_tgetent=no
+@@ -50382,7 +50607,7 @@ fi
+ 	# we don't get a cached "no" result.
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_initialize in -lreadline" >&5
+ $as_echo_n "checking for rl_initialize in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_rl_initialize+set}" = set; then :
++if ${ac_cv_lib_readline_rl_initialize+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -50416,7 +50641,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_initialize" >&5
+ $as_echo "$ac_cv_lib_readline_rl_initialize" >&6; }
+-if test "x$ac_cv_lib_readline_rl_initialize" = x""yes; then :
++if test "x$ac_cv_lib_readline_rl_initialize" = xyes; then :
+   lv_use_readline=yes
+ 		 VIRSH_LIBS="$VIRSH_LIBS -lreadline $LIBS"
+ fi
+@@ -50518,6 +50743,7 @@ if test -n "$NETCF_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_NETCF_CFLAGS=`$PKG_CONFIG --cflags "netcf >= $NETCF_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -50534,6 +50760,7 @@ if test -n "$NETCF_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_NETCF_LIBS=`$PKG_CONFIG --libs "netcf >= $NETCF_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -50553,9 +50780,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        NETCF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "netcf >= $NETCF_REQUIRED" 2>&1`
++	        NETCF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "netcf >= $NETCF_REQUIRED" 2>&1`
+         else
+-	        NETCF_PKG_ERRORS=`$PKG_CONFIG --print-errors "netcf >= $NETCF_REQUIRED" 2>&1`
++	        NETCF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "netcf >= $NETCF_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$NETCF_PKG_ERRORS" >&5
+@@ -50592,7 +50819,7 @@ _ACEOF
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncf_change_begin in -lnetcf" >&5
+ $as_echo_n "checking for ncf_change_begin in -lnetcf... " >&6; }
+-if test "${ac_cv_lib_netcf_ncf_change_begin+set}" = set; then :
++if ${ac_cv_lib_netcf_ncf_change_begin+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -50626,7 +50853,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netcf_ncf_change_begin" >&5
+ $as_echo "$ac_cv_lib_netcf_ncf_change_begin" >&6; }
+-if test "x$ac_cv_lib_netcf_ncf_change_begin" = x""yes; then :
++if test "x$ac_cv_lib_netcf_ncf_change_begin" = xyes; then :
+   netcf_transactions=1
+ else
+   netcf_transactions=0
+@@ -50771,7 +50998,7 @@ fi
+ 
+ if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then
+     ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
+-if test "x$ac_cv_header_mntent_h" = x""yes; then :
++if test "x$ac_cv_header_mntent_h" = xyes; then :
+ 
+ else
+ 
+@@ -50793,7 +51020,7 @@ if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then
+ set dummy mount; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MOUNT+set}" = set; then :
++if ${ac_cv_path_MOUNT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MOUNT in
+@@ -50834,7 +51061,7 @@ fi
+ set dummy umount; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_UMOUNT+set}" = set; then :
++if ${ac_cv_path_UMOUNT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $UMOUNT in
+@@ -50912,7 +51139,7 @@ if test "$with_storage_fs" = "yes"; then
+ set dummy showmount; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_SHOWMOUNT+set}" = set; then :
++if ${ac_cv_path_SHOWMOUNT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $SHOWMOUNT in
+@@ -50961,7 +51188,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then
+ set dummy pvcreate; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PVCREATE+set}" = set; then :
++if ${ac_cv_path_PVCREATE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PVCREATE in
+@@ -51002,7 +51229,7 @@ fi
+ set dummy vgcreate; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_VGCREATE+set}" = set; then :
++if ${ac_cv_path_VGCREATE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $VGCREATE in
+@@ -51043,7 +51270,7 @@ fi
+ set dummy lvcreate; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LVCREATE+set}" = set; then :
++if ${ac_cv_path_LVCREATE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $LVCREATE in
+@@ -51084,7 +51311,7 @@ fi
+ set dummy pvremove; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PVREMOVE+set}" = set; then :
++if ${ac_cv_path_PVREMOVE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PVREMOVE in
+@@ -51125,7 +51352,7 @@ fi
+ set dummy vgremove; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_VGREMOVE+set}" = set; then :
++if ${ac_cv_path_VGREMOVE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $VGREMOVE in
+@@ -51166,7 +51393,7 @@ fi
+ set dummy lvremove; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LVREMOVE+set}" = set; then :
++if ${ac_cv_path_LVREMOVE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $LVREMOVE in
+@@ -51207,7 +51434,7 @@ fi
+ set dummy vgchange; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_VGCHANGE+set}" = set; then :
++if ${ac_cv_path_VGCHANGE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $VGCHANGE in
+@@ -51248,7 +51475,7 @@ fi
+ set dummy vgscan; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_VGSCAN+set}" = set; then :
++if ${ac_cv_path_VGSCAN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $VGSCAN in
+@@ -51289,7 +51516,7 @@ fi
+ set dummy pvs; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PVS+set}" = set; then :
++if ${ac_cv_path_PVS+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PVS in
+@@ -51330,7 +51557,7 @@ fi
+ set dummy vgs; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_VGS+set}" = set; then :
++if ${ac_cv_path_VGS+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $VGS in
+@@ -51371,7 +51598,7 @@ fi
+ set dummy lvs; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LVS+set}" = set; then :
++if ${ac_cv_path_LVS+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $LVS in
+@@ -51516,7 +51743,7 @@ if test "$with_storage_iscsi" = "yes" || test "$with_storage_iscsi" = "check"; t
+ set dummy iscsiadm; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ISCSIADM+set}" = set; then :
++if ${ac_cv_path_ISCSIADM+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ISCSIADM in
+@@ -51631,7 +51858,7 @@ if test "$with_storage_disk" = "yes" ||
+ set dummy parted; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PARTED+set}" = set; then :
++if ${ac_cv_path_PARTED+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PARTED in
+@@ -51672,7 +51899,7 @@ fi
+ set dummy dmsetup; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_DMSETUP+set}" = set; then :
++if ${ac_cv_path_DMSETUP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $DMSETUP in
+@@ -51737,6 +51964,7 @@ if test -n "$LIBPARTED_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBPARTED_CFLAGS=`$PKG_CONFIG --cflags "libparted >= $PARTED_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -51753,6 +51981,7 @@ if test -n "$LIBPARTED_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBPARTED_LIBS=`$PKG_CONFIG --libs "libparted >= $PARTED_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -51772,9 +52001,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libparted >= $PARTED_REQUIRED" 2>&1`
++	        LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libparted >= $PARTED_REQUIRED" 2>&1`
+         else
+-	        LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors "libparted >= $PARTED_REQUIRED" 2>&1`
++	        LIBPARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libparted >= $PARTED_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBPARTED_PKG_ERRORS" >&5
+@@ -51798,7 +52027,7 @@ fi
+     save_CFLAGS="$CFLAGS"
+     PARTED_FOUND=yes
+     ac_fn_c_check_header_mongrel "$LINENO" "parted/parted.h" "ac_cv_header_parted_parted_h" "$ac_includes_default"
+-if test "x$ac_cv_header_parted_parted_h" = x""yes; then :
++if test "x$ac_cv_header_parted_parted_h" = xyes; then :
+ 
+ else
+   PARTED_FOUND=no
+@@ -51807,7 +52036,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+ $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
++if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -51841,7 +52070,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+ $as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+-if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
++if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBUUID 1
+ _ACEOF
+@@ -51854,7 +52083,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ped_device_read in -lparted" >&5
+ $as_echo_n "checking for ped_device_read in -lparted... " >&6; }
+-if test "${ac_cv_lib_parted_ped_device_read+set}" = set; then :
++if ${ac_cv_lib_parted_ped_device_read+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -51888,7 +52117,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_parted_ped_device_read" >&5
+ $as_echo "$ac_cv_lib_parted_ped_device_read" >&6; }
+-if test "x$ac_cv_lib_parted_ped_device_read" = x""yes; then :
++if test "x$ac_cv_lib_parted_ped_device_read" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPARTED 1
+ _ACEOF
+@@ -51965,6 +52194,7 @@ if test -n "$DEVMAPPER_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_DEVMAPPER_CFLAGS=`$PKG_CONFIG --cflags "devmapper >= $DEVMAPPER_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -51981,6 +52211,7 @@ if test -n "$DEVMAPPER_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_DEVMAPPER_LIBS=`$PKG_CONFIG --libs "devmapper >= $DEVMAPPER_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -52000,9 +52231,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "devmapper >= $DEVMAPPER_REQUIRED" 2>&1`
++	        DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "devmapper >= $DEVMAPPER_REQUIRED" 2>&1`
+         else
+-	        DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --print-errors "devmapper >= $DEVMAPPER_REQUIRED" 2>&1`
++	        DEVMAPPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "devmapper >= $DEVMAPPER_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DEVMAPPER_PKG_ERRORS" >&5
+@@ -52026,7 +52257,7 @@ fi
+      DEVMAPPER_FOUND=yes
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_task_run in -ldevmapper" >&5
+ $as_echo_n "checking for dm_task_run in -ldevmapper... " >&6; }
+-if test "${ac_cv_lib_devmapper_dm_task_run+set}" = set; then :
++if ${ac_cv_lib_devmapper_dm_task_run+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -52060,7 +52291,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_devmapper_dm_task_run" >&5
+ $as_echo "$ac_cv_lib_devmapper_dm_task_run" >&6; }
+-if test "x$ac_cv_lib_devmapper_dm_task_run" = x""yes; then :
++if test "x$ac_cv_lib_devmapper_dm_task_run" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDEVMAPPER 1
+ _ACEOF
+@@ -52078,7 +52309,7 @@ fi
+    for ac_header in libdevmapper.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "libdevmapper.h" "ac_cv_header_libdevmapper_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libdevmapper_h" = x""yes; then :
++if test "x$ac_cv_header_libdevmapper_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDEVMAPPER_H 1
+ _ACEOF
+@@ -52117,6 +52348,7 @@ if test -n "$LIBCURL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= $LIBCURL_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -52133,6 +52365,7 @@ if test -n "$LIBCURL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= $LIBCURL_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -52152,9 +52385,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl >= $LIBCURL_REQUIRED" 2>&1`
++	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= $LIBCURL_REQUIRED" 2>&1`
+         else
+-	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl >= $LIBCURL_REQUIRED" 2>&1`
++	        LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= $LIBCURL_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBCURL_PKG_ERRORS" >&5
+@@ -52333,7 +52566,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then :
++if ${ac_cv_path_PYTHON+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PYTHON in
+@@ -52384,7 +52617,7 @@ test -n "$PYTHON" || PYTHON=":"
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+ $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+-if test "${am_cv_python_version+set}" = set; then :
++if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+@@ -52403,7 +52636,7 @@ $as_echo "$am_cv_python_version" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+ $as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+-if test "${am_cv_python_platform+set}" = set; then :
++if ${am_cv_python_platform+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+@@ -52417,7 +52650,7 @@ $as_echo "$am_cv_python_platform" >&6; }
+ 
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+ $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+-if test "${am_cv_python_pythondir+set}" = set; then :
++if ${am_cv_python_pythondir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$prefix" = xNONE
+@@ -52455,7 +52688,7 @@ $as_echo "$am_cv_python_pythondir" >&6; }
+ 
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+ $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+-if test "${am_cv_python_pyexecdir+set}" = set; then :
++if ${am_cv_python_pyexecdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$exec_prefix" = xNONE
+@@ -52557,7 +52790,7 @@ if test "${enable_coverage}" = yes; then
+   WARN_CFLAGS=
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -fprofile-arcs" >&5
+ $as_echo_n "checking whether compiler handles -fprofile-arcs... " >&6; }
+-if test "${gl_cv_warn__fprofile_arcs+set}" = set; then :
++if ${gl_cv_warn__fprofile_arcs+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -52579,19 +52812,19 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__fprofile_arcs=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__fprofile_arcs" >&5
+ $as_echo "$gl_cv_warn__fprofile_arcs" >&6; }
+-if test "x$gl_cv_warn__fprofile_arcs" = x""yes; then :
++if test "x$gl_cv_warn__fprofile_arcs" = xyes; then :
+   as_fn_append WARN_CFLAGS " -fprofile-arcs"
+ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler handles -ftest-coverage" >&5
+ $as_echo_n "checking whether compiler handles -ftest-coverage... " >&6; }
+-if test "${gl_cv_warn__ftest_coverage+set}" = set; then :
++if ${gl_cv_warn__ftest_coverage+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -52613,13 +52846,13 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   gl_cv_warn__ftest_coverage=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+   CPPFLAGS="$gl_save_CPPFLAGS"
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn__ftest_coverage" >&5
+ $as_echo "$gl_cv_warn__ftest_coverage" >&6; }
+-if test "x$gl_cv_warn__ftest_coverage" = x""yes; then :
++if test "x$gl_cv_warn__ftest_coverage" = xyes; then :
+   as_fn_append WARN_CFLAGS " -ftest-coverage"
+ fi
+ 
+@@ -52646,7 +52879,7 @@ enable_oom=$enableval
+ if test "${enable_oom}" = yes; then
+   have_trace=yes
+   ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+-if test "x$ac_cv_header_execinfo_h" = x""yes; then :
++if test "x$ac_cv_header_execinfo_h" = xyes; then :
+ 
+ else
+   have_trace=no
+@@ -52654,7 +52887,7 @@ fi
+ 
+ 
+   ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace"
+-if test "x$ac_cv_func_backtrace" = x""yes; then :
++if test "x$ac_cv_func_backtrace" = xyes; then :
+ 
+ else
+   have_trace=no
+@@ -52760,7 +52993,7 @@ rm -f conf$$.file
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then :
++if ${ac_cv_path_MSGFMT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGFMT" in
+@@ -52801,7 +53034,7 @@ fi
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
++if ${ac_cv_path_GMSGFMT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GMSGFMT in
+@@ -52883,7 +53116,7 @@ rm -f conf$$.file
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
++if ${ac_cv_path_XGETTEXT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$XGETTEXT" in
+@@ -52961,7 +53194,7 @@ rm -f conf$$.file
+ set dummy msgmerge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
++if ${ac_cv_path_MSGMERGE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGMERGE" in
+@@ -53472,7 +53705,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
++if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_LIBS="$LIBS"
+@@ -53506,7 +53739,7 @@ $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+   fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+ $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
++if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_LIBS="$LIBS"
+@@ -53582,7 +53815,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+ $as_echo_n "checking for GNU gettext in libc... " >&6; }
+-if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
++if eval \${$gt_func_gnugettext_libc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -53645,7 +53878,7 @@ $as_echo "$ac_res" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+ $as_echo_n "checking for iconv... " >&6; }
+-if test "${am_cv_func_iconv+set}" = set; then :
++if ${am_cv_func_iconv+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -53702,7 +53935,7 @@ $as_echo "$am_cv_func_iconv" >&6; }
+   if test "$am_cv_func_iconv" = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+ $as_echo_n "checking for working iconv... " >&6; }
+-if test "${am_cv_func_iconv_works+set}" = set; then :
++if ${am_cv_func_iconv_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -54253,7 +54486,7 @@ fi
+ 
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+ $as_echo_n "checking for GNU gettext in libintl... " >&6; }
+-if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
++if eval \${$gt_func_gnugettext_libintl+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_CPPFLAGS="$CPPFLAGS"
+@@ -54502,7 +54735,7 @@ case "$host" in
+ set dummy ${ac_tool_prefix}windres; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_WINDRES+set}" = set; then :
++if ${ac_cv_prog_WINDRES+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$WINDRES"; then
+@@ -54542,7 +54775,7 @@ if test -z "$ac_cv_prog_WINDRES"; then
+ set dummy windres; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
++if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_WINDRES"; then
+@@ -54676,6 +54909,7 @@ if test -n "$HAL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -54692,6 +54926,7 @@ if test -n "$HAL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -54711,9 +54946,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= $HAL_REQUIRED" 2>&1`
++	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hal >= $HAL_REQUIRED" 2>&1`
+         else
+-	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= $HAL_REQUIRED" 2>&1`
++	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hal >= $HAL_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$HAL_PKG_ERRORS" >&5
+@@ -54750,7 +54985,7 @@ fi
+     for ac_func in libhal_get_all_devices
+ do :
+   ac_fn_c_check_func "$LINENO" "libhal_get_all_devices" "ac_cv_func_libhal_get_all_devices"
+-if test "x$ac_cv_func_libhal_get_all_devices" = x""yes; then :
++if test "x$ac_cv_func_libhal_get_all_devices" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBHAL_GET_ALL_DEVICES 1
+ _ACEOF
+@@ -54763,7 +54998,7 @@ done
+     for ac_func in dbus_watch_get_unix_fd
+ do :
+   ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd"
+-if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then :
++if test "x$ac_cv_func_dbus_watch_get_unix_fd" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DBUS_WATCH_GET_UNIX_FD 1
+ _ACEOF
+@@ -54826,6 +55061,7 @@ if test -n "$UDEV_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= $UDEV_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -54842,6 +55078,7 @@ if test -n "$UDEV_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= $UDEV_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -54861,9 +55098,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev >= $UDEV_REQUIRED" 2>&1`
++	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= $UDEV_REQUIRED" 2>&1`
+         else
+-	        UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= $UDEV_REQUIRED" 2>&1`
++	        UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= $UDEV_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$UDEV_PKG_ERRORS" >&5
+@@ -54908,6 +55145,7 @@ if test -n "$PCIACCESS_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= $PCIACCESS_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -54924,6 +55162,7 @@ if test -n "$PCIACCESS_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= $PCIACCESS_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -54943,9 +55182,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pciaccess >= $PCIACCESS_REQUIRED" 2>&1`
++	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pciaccess >= $PCIACCESS_REQUIRED" 2>&1`
+         else
+-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pciaccess >= $PCIACCESS_REQUIRED" 2>&1`
++	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pciaccess >= $PCIACCESS_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PCIACCESS_PKG_ERRORS" >&5
+@@ -55122,7 +55361,7 @@ if test "$with_macvtap" = yes; then
+       #include <linux/if_link.h>
+ 
+ "
+-if test "x$ac_cv_have_decl_MACVLAN_MODE_PASSTHRU" = x""yes; then :
++if test "x$ac_cv_have_decl_MACVLAN_MODE_PASSTHRU" = xyes; then :
+   ac_have_decl=1
+ else
+   ac_have_decl=0
+@@ -55223,6 +55462,7 @@ if test -n "$LIBNL_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-1 >= $LIBNL_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -55239,6 +55479,7 @@ if test -n "$LIBNL_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-1 >= $LIBNL_REQUIRED" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -55258,9 +55499,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-1 >= $LIBNL_REQUIRED" 2>&1`
++	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-1 >= $LIBNL_REQUIRED" 2>&1`
+         else
+-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-1 >= $LIBNL_REQUIRED" 2>&1`
++	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-1 >= $LIBNL_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBNL_PKG_ERRORS" >&5
+@@ -55319,7 +55560,7 @@ cp -f COPYING.LIB COPYING
+ # or Coverity-prevent's cov-build.  Define STATIC_ANALYSIS accordingly.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this build is done by a static analysis tool" >&5
+ $as_echo_n "checking whether this build is done by a static analysis tool... " >&6; }
+-if test "${lv_cv_static_analysis+set}" = set; then :
++if ${lv_cv_static_analysis+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -55406,10 +55647,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+-    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+-    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -55805,7 +56057,7 @@ if test -z "${HAVE_LIBNL_TRUE}" && test -z "${HAVE_LIBNL_FALSE}"; then
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -55906,6 +56158,7 @@ fi
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -56213,7 +56466,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # values after options handling.
+ ac_log="
+ This file was extended by libvirt $as_me 0.9.4, which was
+-generated by GNU Autoconf 2.66.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -56284,7 +56537,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ libvirt config.status 0.9.4
+-configured by $0, generated by GNU Autoconf 2.66,
++configured by $0, generated by GNU Autoconf 2.68,
+   with options \\"\$ac_cs_config\\"
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -56305,11 +56558,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+-  --*=*)
++  --*=?*)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
++  --*=)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=
++    ac_shift=:
++    ;;
+   *)
+     ac_option=$1
+     ac_optarg=$2
+@@ -56331,6 +56589,7 @@ do
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
+     esac
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+@@ -56735,9 +56994,10 @@ fi
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  tmp=
++  tmp= ac_tmp=
+   trap 'exit_status=$?
+-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++  : "${ac_tmp:=$tmp}"
++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ ' 0
+   trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -56745,12 +57005,13 @@ $debug ||
+ 
+ {
+   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
++  test -d "$tmp"
+ }  ||
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -56772,7 +57033,7 @@ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+ 
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+ _ACEOF
+ 
+ 
+@@ -56800,7 +57061,7 @@ done
+ rm -f conf$$subs.sh
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -56848,7 +57109,7 @@ t delim
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+   for (key in S) S_is_set[key] = 1
+   FS = ""
+ 
+@@ -56880,7 +57141,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+   cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+@@ -56914,7 +57175,7 @@ fi # test -n "$CONFIG_FILES"
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+ 
+@@ -56926,8 +57187,8 @@ _ACEOF
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+-  if test -z "$ac_t"; then
++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_tt"; then
+     break
+   elif $ac_last_try; then
+     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+@@ -57047,7 +57308,7 @@ do
+     for ac_f
+     do
+       case $ac_f in
+-      -) ac_f="$tmp/stdin";;
++      -) ac_f="$ac_tmp/stdin";;
+       *) # Look for the file first in the build tree, then in the source tree
+ 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+ 	 # because $ac_f cannot contain `:'.
+@@ -57082,7 +57343,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+     esac
+ 
+     case $ac_tag in
+-    *:-:* | *:-) cat >"$tmp/stdin" \
++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+@@ -57219,21 +57480,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+-  rm -f "$tmp/stdin"
++  rm -f "$ac_tmp/stdin"
+   case $ac_file in
+-  -) cat "$tmp/out" && rm -f "$tmp/out";;
+-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+   esac \
+   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  ;;
+@@ -57244,20 +57506,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
+   if test x"$ac_file" != x-; then
+     {
+       $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+-    } >"$tmp/config.h" \
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++    } >"$ac_tmp/config.h" \
+       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+-      mv "$tmp/config.h" "$ac_file" \
++      mv "$ac_tmp/config.h" "$ac_file" \
+ 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+       || as_fn_error $? "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+-- 
diff --git a/debian/patches/Readd-LFS-support.patch b/debian/patches/Readd-LFS-support.patch
new file mode 100644
index 0000000..b0ebdb8
--- /dev/null
+++ b/debian/patches/Readd-LFS-support.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Tue, 9 Aug 2011 14:44:09 +0200
+Subject: Readd LFS support
+
+BZ: #517037
+---
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c8d291b..feeba64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -122,6 +122,8 @@ AC_MSG_RESULT([$have_cpuid])
+ 
+ AC_CHECK_SIZEOF([long])
+ 
++AC_SYS_LARGEFILE
++
+ dnl Availability of various common functions (non-fatal if missing),
+ dnl and various less common threadsafe functions
+ AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fbeb7b0..37cb2f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
 Disable-failing-virnetsockettest.patch
+Readd-LFS-support.patch
+Autoreconf.patch

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list