All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] configure: Check for flex
@ 2012-04-15 18:43 Jean Guyader
  2012-04-16  7:42 ` Ian Campbell
  2012-04-16  8:54 ` Roger Pau Monne
  0 siblings, 2 replies; 5+ messages in thread
From: Jean Guyader @ 2012-04-15 18:43 UTC (permalink / raw)
  To: xen-devel; +Cc: Jean Guyader

libxl require the command flex to be present.
Verify in the configure script that the flex
command exsits.

Signed-off-by: Jean Guyader <jean.guyader@gmail.com>
---
 tools/configure    |  633 +++++++++++++++++++++++++++++-----------------------
 tools/configure.ac |    1 +
 2 files changed, 350 insertions(+), 284 deletions(-)

diff --git a/tools/configure b/tools/configure
index 86618f5..071adf7 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Xen Hypervisor 4.2.
+# Generated by GNU Autoconf 2.68 for Xen Hypervisor 4.2.
 #
 # Report bugs to <xen-devel@lists.xensource.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
@@ -216,11 +217,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 :
@@ -1164,7 +1172,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
@@ -1490,7 +1498,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 Xen Hypervisor configure 4.2
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1536,7 +1544,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
@@ -1573,7 +1581,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
@@ -1586,10 +1594,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
@@ -1656,7 +1664,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"
@@ -1665,7 +1673,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
 
@@ -1706,7 +1714,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
@@ -1720,7 +1728,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
@@ -1738,7 +1746,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
 
@@ -1783,11 +1791,65 @@ 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
 
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+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 \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1796,7 +1858,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
@@ -1851,64 +1913,10 @@ 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
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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;}
-
-} # ac_fn_c_check_type
-
 # ac_fn_c_find_intX_t LINENO BITS VAR
 # -----------------------------------
 # Finds a signed integer type with width BITS, setting cache variable VAR
@@ -1918,7 +1926,7 @@ ac_fn_c_find_intX_t ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
 $as_echo_n "checking for int$2_t... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -1979,7 +1987,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_find_intX_t
 
@@ -1992,7 +2000,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
@@ -2036,7 +2044,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
 
@@ -2049,7 +2057,7 @@ ac_fn_c_find_uintX_t ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
 $as_echo_n "checking for uint$2_t... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2089,7 +2097,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_find_uintX_t
 cat >config.log <<_ACEOF
@@ -2097,7 +2105,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Xen Hypervisor $as_me 4.2, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2355,7 +2363,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2508,7 +2516,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
@@ -2548,7 +2556,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
@@ -2601,7 +2609,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
@@ -2641,7 +2649,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
@@ -2700,7 +2708,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
@@ -2744,7 +2752,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
@@ -2799,7 +2807,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2914,7 +2922,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2957,7 +2965,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3016,7 +3024,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3027,7 +3035,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
@@ -3068,7 +3076,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3078,7 +3086,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
@@ -3115,7 +3123,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
@@ -3193,7 +3201,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
@@ -3301,7 +3309,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
@@ -3417,7 +3425,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3429,7 +3437,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $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
@@ -3492,7 +3500,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
@@ -3559,7 +3567,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
@@ -3688,7 +3696,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=
@@ -3710,7 +3718,7 @@ $as_echo "#define _MINIX 1" >>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
@@ -3753,7 +3761,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
@@ -3769,7 +3777,7 @@ fi
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3787,7 +3795,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
@@ -3802,7 +3810,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4196,7 +4204,7 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
 # Checks for programs.
 { $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/
@@ -4273,7 +4281,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
@@ -4313,7 +4321,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
@@ -4366,7 +4374,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
@@ -4406,7 +4414,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
@@ -4465,7 +4473,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
@@ -4509,7 +4517,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
@@ -4564,7 +4572,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4593,7 +4601,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
@@ -4630,7 +4638,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
@@ -4708,7 +4716,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
@@ -4818,7 +4826,7 @@ fi
 $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
@@ -4862,7 +4870,7 @@ fi
 { $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
@@ -4942,7 +4950,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 set dummy perl; 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_PERL+set}" = set; then :
+if ${ac_cv_path_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -4989,7 +4997,7 @@ if test "x$xapi" = "xy"; then :
 set dummy curl-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_CURL+set}" = set; then :
+if ${ac_cv_path_CURL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CURL in
@@ -5034,7 +5042,7 @@ fi
 set dummy xml2-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_XML+set}" = set; then :
+if ${ac_cv_path_XML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XML in
@@ -5085,7 +5093,7 @@ if test "x$ocamltools" = "xy"; then :
 set dummy ${ac_tool_prefix}ocamlc; 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_OCAMLC+set}" = set; then :
+if ${ac_cv_prog_OCAMLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLC"; then
@@ -5125,7 +5133,7 @@ if test -z "$ac_cv_prog_OCAMLC"; then
 set dummy ocamlc; 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_OCAMLC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLC"; then
@@ -5196,7 +5204,7 @@ $as_echo "OCaml library path is $OCAMLLIB" >&6; }
 set dummy ${ac_tool_prefix}ocamlopt; 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_OCAMLOPT+set}" = set; then :
+if ${ac_cv_prog_OCAMLOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLOPT"; then
@@ -5236,7 +5244,7 @@ if test -z "$ac_cv_prog_OCAMLOPT"; then
 set dummy ocamlopt; 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_OCAMLOPT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLOPT"; then
@@ -5306,7 +5314,7 @@ $as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; }
 set dummy ${ac_tool_prefix}ocamlc.opt; 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_OCAMLCDOTOPT+set}" = set; then :
+if ${ac_cv_prog_OCAMLCDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLCDOTOPT"; then
@@ -5346,7 +5354,7 @@ if test -z "$ac_cv_prog_OCAMLCDOTOPT"; then
 set dummy ocamlc.opt; 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_OCAMLCDOTOPT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLCDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLCDOTOPT"; then
@@ -5410,7 +5418,7 @@ $as_echo "versions differs from ocamlc; ocamlc.opt discarded." >&6; }
 set dummy ${ac_tool_prefix}ocamlopt.opt; 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_OCAMLOPTDOTOPT+set}" = set; then :
+if ${ac_cv_prog_OCAMLOPTDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLOPTDOTOPT"; then
@@ -5450,7 +5458,7 @@ if test -z "$ac_cv_prog_OCAMLOPTDOTOPT"; then
 set dummy ocamlopt.opt; 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_OCAMLOPTDOTOPT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLOPTDOTOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
@@ -5519,7 +5527,7 @@ $as_echo "version differs from ocamlc; ocamlopt.opt discarded." >&6; }
 set dummy ${ac_tool_prefix}ocaml; 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_OCAML+set}" = set; then :
+if ${ac_cv_prog_OCAML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAML"; then
@@ -5559,7 +5567,7 @@ if test -z "$ac_cv_prog_OCAML"; then
 set dummy ocaml; 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_OCAML+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAML"; then
@@ -5613,7 +5621,7 @@ fi
 set dummy ${ac_tool_prefix}ocamldep; 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_OCAMLDEP+set}" = set; then :
+if ${ac_cv_prog_OCAMLDEP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLDEP"; then
@@ -5653,7 +5661,7 @@ if test -z "$ac_cv_prog_OCAMLDEP"; then
 set dummy ocamldep; 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_OCAMLDEP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLDEP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLDEP"; then
@@ -5707,7 +5715,7 @@ fi
 set dummy ${ac_tool_prefix}ocamlmktop; 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_OCAMLMKTOP+set}" = set; then :
+if ${ac_cv_prog_OCAMLMKTOP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLMKTOP"; then
@@ -5747,7 +5755,7 @@ if test -z "$ac_cv_prog_OCAMLMKTOP"; then
 set dummy ocamlmktop; 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_OCAMLMKTOP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLMKTOP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLMKTOP"; then
@@ -5801,7 +5809,7 @@ fi
 set dummy ${ac_tool_prefix}ocamlmklib; 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_OCAMLMKLIB+set}" = set; then :
+if ${ac_cv_prog_OCAMLMKLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLMKLIB"; then
@@ -5841,7 +5849,7 @@ if test -z "$ac_cv_prog_OCAMLMKLIB"; then
 set dummy ocamlmklib; 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_OCAMLMKLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLMKLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLMKLIB"; then
@@ -5895,7 +5903,7 @@ fi
 set dummy ${ac_tool_prefix}ocamldoc; 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_OCAMLDOC+set}" = set; then :
+if ${ac_cv_prog_OCAMLDOC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLDOC"; then
@@ -5935,7 +5943,7 @@ if test -z "$ac_cv_prog_OCAMLDOC"; then
 set dummy ocamldoc; 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_OCAMLDOC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLDOC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLDOC"; then
@@ -5989,7 +5997,7 @@ fi
 set dummy ${ac_tool_prefix}ocamlbuild; 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_OCAMLBUILD+set}" = set; then :
+if ${ac_cv_prog_OCAMLBUILD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OCAMLBUILD"; then
@@ -6029,7 +6037,7 @@ if test -z "$ac_cv_prog_OCAMLBUILD"; then
 set dummy ocamlbuild; 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_OCAMLBUILD+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OCAMLBUILD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OCAMLBUILD"; then
@@ -6092,7 +6100,7 @@ fi
 set dummy bash; 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_BASH+set}" = set; then :
+if ${ac_cv_path_BASH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $BASH in
@@ -6149,7 +6157,7 @@ fi
 set dummy $PYTHON; 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_PYTHONPATH+set}" = set; then :
+if ${ac_cv_path_PYTHONPATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHONPATH in
@@ -6225,7 +6233,7 @@ LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
     print distutils.sysconfig.get_config_var("LDFLAGS")'`"
 
 ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-if test "x$ac_cv_header_Python_h" = x""yes; then :
+if test "x$ac_cv_header_Python_h" = xyes; then :
 
 else
   as_fn_error $? "Unable to find Python development headers" "$LINENO" 5
@@ -6235,7 +6243,7 @@ fi
 as_ac_Lib=`$as_echo "ac_cv_lib_python$ac_python_version''_PyArg_ParseTuple" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyArg_ParseTuple in -lpython$ac_python_version" >&5
 $as_echo_n "checking for PyArg_ParseTuple in -lpython$ac_python_version... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6290,7 +6298,7 @@ fi
 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
@@ -6335,7 +6343,7 @@ fi
 set dummy as86; 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_AS86+set}" = set; then :
+if ${ac_cv_path_AS86+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $AS86 in
@@ -6380,7 +6388,7 @@ fi
 set dummy ld86; 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_LD86+set}" = set; then :
+if ${ac_cv_path_LD86+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $LD86 in
@@ -6425,7 +6433,7 @@ fi
 set dummy bcc; 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_BCC+set}" = set; then :
+if ${ac_cv_path_BCC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $BCC in
@@ -6470,7 +6478,7 @@ fi
 set dummy iasl; 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_IASL+set}" = set; then :
+if ${ac_cv_path_IASL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $IASL in
@@ -6511,13 +6519,58 @@ if test x"${IASL}" == x"no"
 then
     as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5
 fi
+# Extract the first word of "flex", so it can be a program name with args.
+set dummy flex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FLEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FLEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_FLEX" && ac_cv_path_FLEX="no"
+  ;;
+esac
+fi
+FLEX=$ac_cv_path_FLEX
+if test -n "$FLEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+$as_echo "$FLEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x"${FLEX}" == x"no"
+then
+    as_fn_error $? "Unable to find flex, please install flex" "$LINENO" 5
+fi
 
 ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then :
+if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
 $as_echo_n "checking for uuid_clear in -luuid... " >&6; }
-if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
+if ${ac_cv_lib_uuid_uuid_clear+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6551,7 +6604,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_clear" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_clear" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_clear" = x""yes; then :
+if test "x$ac_cv_lib_uuid_uuid_clear" = xyes; then :
   libuuid="y"
 fi
 
@@ -6560,7 +6613,7 @@ fi
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_h" = x""yes; then :
+if test "x$ac_cv_header_uuid_h" = xyes; then :
   libuuid="y"
 fi
 
@@ -6573,11 +6626,11 @@ fi
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_curses_h" = x""yes; then :
+if test "x$ac_cv_header_curses_h" = xyes; then :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clear in -lcurses" >&5
 $as_echo_n "checking for clear in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_clear+set}" = set; then :
+if ${ac_cv_lib_curses_clear+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6611,7 +6664,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_clear" >&5
 $as_echo "$ac_cv_lib_curses_clear" >&6; }
-if test "x$ac_cv_lib_curses_clear" = x""yes; then :
+if test "x$ac_cv_lib_curses_clear" = xyes; then :
   curses="y"
 else
   curses="n"
@@ -6624,11 +6677,11 @@ fi
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_h" = xyes; then :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clear in -lncurses" >&5
 $as_echo_n "checking for clear in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_clear+set}" = set; then :
+if ${ac_cv_lib_ncurses_clear+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6662,7 +6715,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_clear" >&5
 $as_echo "$ac_cv_lib_ncurses_clear" >&6; }
-if test "x$ac_cv_lib_ncurses_clear" = x""yes; then :
+if test "x$ac_cv_lib_ncurses_clear" = xyes; then :
   ncurses="y"
 else
   ncurses="n"
@@ -6709,7 +6762,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 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
@@ -6752,7 +6805,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
@@ -6897,7 +6950,7 @@ and glib_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	glib_CFLAGS=$pkg_cv_glib_CFLAGS
 	glib_LIBS=$pkg_cv_glib_LIBS
@@ -6933,11 +6986,11 @@ fi
 
 # Checks for libraries.
 ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_bzlib_h" = x""yes; then :
+if test "x$ac_cv_header_bzlib_h" = xyes; then :
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompressInit in -lbz2" >&5
 $as_echo_n "checking for BZ2_bzDecompressInit in -lbz2... " >&6; }
-if test "${ac_cv_lib_bz2_BZ2_bzDecompressInit+set}" = set; then :
+if ${ac_cv_lib_bz2_BZ2_bzDecompressInit+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6971,7 +7024,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzDecompressInit" >&5
 $as_echo "$ac_cv_lib_bz2_BZ2_bzDecompressInit" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = x""yes; then :
+if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = xyes; then :
   zlib="$zlib -DHAVE_BZLIB -lbz2"
 fi
 
@@ -6980,11 +7033,11 @@ fi
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
-if test "x$ac_cv_header_lzma_h" = x""yes; then :
+if test "x$ac_cv_header_lzma_h" = xyes; then :
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_stream_decoder in -llzma" >&5
 $as_echo_n "checking for lzma_stream_decoder in -llzma... " >&6; }
-if test "${ac_cv_lib_lzma_lzma_stream_decoder+set}" = set; then :
+if ${ac_cv_lib_lzma_lzma_stream_decoder+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7018,7 +7071,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_stream_decoder" >&5
 $as_echo "$ac_cv_lib_lzma_lzma_stream_decoder" >&6; }
-if test "x$ac_cv_lib_lzma_lzma_stream_decoder" = x""yes; then :
+if test "x$ac_cv_lib_lzma_lzma_stream_decoder" = xyes; then :
   zlib="$zlib -DHAVE_LZMA -llzma"
 fi
 
@@ -7027,11 +7080,11 @@ fi
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "lzo/lzo1x.h" "ac_cv_header_lzo_lzo1x_h" "$ac_includes_default"
-if test "x$ac_cv_header_lzo_lzo1x_h" = x""yes; then :
+if test "x$ac_cv_header_lzo_lzo1x_h" = xyes; then :
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_decompress in -llzo2" >&5
 $as_echo_n "checking for lzo1x_decompress in -llzo2... " >&6; }
-if test "${ac_cv_lib_lzo2_lzo1x_decompress+set}" = set; then :
+if ${ac_cv_lib_lzo2_lzo1x_decompress+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7065,7 +7118,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo2_lzo1x_decompress" >&5
 $as_echo "$ac_cv_lib_lzo2_lzo1x_decompress" >&6; }
-if test "x$ac_cv_lib_lzo2_lzo1x_decompress" = x""yes; then :
+if test "x$ac_cv_lib_lzo2_lzo1x_decompress" = xyes; then :
   zlib="$zlib -DHAVE_LZO1X -llzo2"
 fi
 
@@ -7076,7 +7129,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5
 $as_echo_n "checking for io_setup in -laio... " >&6; }
-if test "${ac_cv_lib_aio_io_setup+set}" = set; then :
+if ${ac_cv_lib_aio_io_setup+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7110,7 +7163,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_io_setup" >&5
 $as_echo "$ac_cv_lib_aio_io_setup" >&6; }
-if test "x$ac_cv_lib_aio_io_setup" = x""yes; then :
+if test "x$ac_cv_lib_aio_io_setup" = xyes; then :
   system_aio="y"
 else
   system_aio="n"
@@ -7119,7 +7172,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5
 $as_echo_n "checking for MD5 in -lcrypto... " >&6; }
-if test "${ac_cv_lib_crypto_MD5+set}" = set; then :
+if ${ac_cv_lib_crypto_MD5+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7153,7 +7206,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5
 $as_echo "$ac_cv_lib_crypto_MD5" >&6; }
-if test "x$ac_cv_lib_crypto_MD5" = x""yes; then :
+if test "x$ac_cv_lib_crypto_MD5" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPTO 1
 _ACEOF
@@ -7166,7 +7219,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ext2fs_open2 in -lext2fs" >&5
 $as_echo_n "checking for ext2fs_open2 in -lext2fs... " >&6; }
-if test "${ac_cv_lib_ext2fs_ext2fs_open2+set}" = set; then :
+if ${ac_cv_lib_ext2fs_ext2fs_open2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7200,7 +7253,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext2fs_ext2fs_open2" >&5
 $as_echo "$ac_cv_lib_ext2fs_ext2fs_open2" >&6; }
-if test "x$ac_cv_lib_ext2fs_ext2fs_open2" = x""yes; then :
+if test "x$ac_cv_lib_ext2fs_ext2fs_open2" = xyes; then :
   libext2fs="y"
 else
   libext2fs="n"
@@ -7209,7 +7262,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_md_hash_buffer in -lgcrypt" >&5
 $as_echo_n "checking for gcry_md_hash_buffer in -lgcrypt... " >&6; }
-if test "${ac_cv_lib_gcrypt_gcry_md_hash_buffer+set}" = set; then :
+if ${ac_cv_lib_gcrypt_gcry_md_hash_buffer+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7243,7 +7296,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_md_hash_buffer" >&5
 $as_echo "$ac_cv_lib_gcrypt_gcry_md_hash_buffer" >&6; }
-if test "x$ac_cv_lib_gcrypt_gcry_md_hash_buffer" = x""yes; then :
+if test "x$ac_cv_lib_gcrypt_gcry_md_hash_buffer" = xyes; then :
   libgcrypt="y"
 else
   libgcrypt="n"
@@ -7253,7 +7306,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread flag" >&5
 $as_echo_n "checking for pthread flag... " >&6; }
-if test "${ax_cv_pthread_flags+set}" = set; then :
+if ${ax_cv_pthread_flags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7317,7 +7370,7 @@ $as_echo "$ax_cv_pthread_flags" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
 $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+if ${ac_cv_lib_rt_clock_gettime+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7351,7 +7404,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
 $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRT 1
 _ACEOF
@@ -7362,7 +7415,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5
 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
-if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then :
+if ${ac_cv_lib_yajl_yajl_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7396,7 +7449,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yajl_yajl_alloc" >&5
 $as_echo "$ac_cv_lib_yajl_yajl_alloc" >&6; }
-if test "x$ac_cv_lib_yajl_yajl_alloc" = x""yes; then :
+if test "x$ac_cv_lib_yajl_yajl_alloc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBYAJL 1
 _ACEOF
@@ -7409,7 +7462,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflateCopy in -lz" >&5
 $as_echo_n "checking for deflateCopy in -lz... " >&6; }
-if test "${ac_cv_lib_z_deflateCopy+set}" = set; then :
+if ${ac_cv_lib_z_deflateCopy+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7443,7 +7496,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflateCopy" >&5
 $as_echo "$ac_cv_lib_z_deflateCopy" >&6; }
-if test "x$ac_cv_lib_z_deflateCopy" = x""yes; then :
+if test "x$ac_cv_lib_z_deflateCopy" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -7456,7 +7509,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
 $as_echo_n "checking for libiconv_open in -liconv... " >&6; }
-if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then :
+if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7490,7 +7543,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
 $as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; }
-if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then :
+if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then :
   libiconv="y"
 else
   libiconv="n"
@@ -7499,11 +7552,22 @@ fi
 
 
 # Checks for header files.
+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
@@ -7536,7 +7600,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
@@ -7555,7 +7619,7 @@ else
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
@@ -7599,7 +7663,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
@@ -7640,7 +7704,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 :
@@ -7711,7 +7775,7 @@ done
 # Checks for typedefs, structures, and compiler characteristics.
 { $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
@@ -7743,7 +7807,7 @@ else
 	char b[false == 0 ? 1 : -1];
 	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
 	char d[(bool) 0.5 == true ? 1 : -1];
-	bool e = &s;
+	/* See body of main program for 'e'.  */
 	char f[(_Bool) 0.0 == false ? 1 : -1];
 	char g[true];
 	char h[sizeof (_Bool)];
@@ -7754,25 +7818,6 @@ else
 	_Bool n[m];
 	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
 	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-#	if defined __xlc__ || defined __GNUC__
-	 /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-	    reported by James Lemley on 2005-10-05; see
-	    http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-	    This test is not quite right, since xlc is allowed to
-	    reject this program, as the initializer for xlcbug is
-	    not one of the forms that C requires support for.
-	    However, doing the test right would require a runtime
-	    test, and that would make cross-compilation harder.
-	    Let us hope that IBM fixes the xlc bug, and also adds
-	    support for this kind of constant expression.  In the
-	    meantime, this test will reject xlc, which is OK, since
-	    our stdbool.h substitute should suffice.  We also test
-	    this with GCC, where it should work, to detect more
-	    quickly whether someone messes up the test in the
-	    future.  */
-	 char digs[] = "0123456789";
-	 int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-#	endif
 	/* Catch a bug in an HP-UX C compiler.  See
 	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
 	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
@@ -7784,6 +7829,7 @@ int
 main ()
 {
 
+	bool e = &s;
 	*pq |= q;
 	*pq |= ! q;
 	/* Refer to every declared value, to avoid compiler optimizations.  */
@@ -7804,7 +7850,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
@@ -7821,7 +7867,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
@@ -7851,7 +7897,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
@@ -7936,7 +7982,7 @@ _ACEOF
 esac
 
 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
 
@@ -7947,7 +7993,7 @@ _ACEOF
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
+if test "x$ac_cv_type_off_t" = xyes; then :
 
 else
 
@@ -7958,7 +8004,7 @@ _ACEOF
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -7970,7 +8016,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
@@ -8015,7 +8061,7 @@ _ACEOF
  esac
 
 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 :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -8026,7 +8072,7 @@ _ACEOF
 fi
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
 else
 
@@ -8037,7 +8083,7 @@ _ACEOF
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
@@ -8047,7 +8093,7 @@ _ACEOF
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BLOCKS 1
@@ -8067,7 +8113,7 @@ fi
 
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_RDEV 1
@@ -8131,7 +8177,7 @@ _ACEOF
   esac
 
 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 :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PTRDIFF_T 1
@@ -8144,7 +8190,7 @@ fi
 # Checks for library functions.
 { $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
@@ -8180,7 +8226,7 @@ fi
 for ac_header in vfork.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = x""yes; then :
+if test "x$ac_cv_header_vfork_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VFORK_H 1
 _ACEOF
@@ -8204,7 +8250,7 @@ done
 if test "x$ac_cv_func_fork" = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
 $as_echo_n "checking for working fork... " >&6; }
-if test "${ac_cv_func_fork_works+set}" = set; then :
+if ${ac_cv_func_fork_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8257,7 +8303,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
 $as_echo_n "checking for working vfork... " >&6; }
-if test "${ac_cv_func_vfork_works+set}" = set; then :
+if ${ac_cv_func_vfork_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8392,7 +8438,7 @@ fi
 
 { $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
@@ -8460,7 +8506,7 @@ fi
 
 { $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 "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f conftest.sym conftest.file
@@ -8522,7 +8568,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
 $as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then :
+if ${ac_cv_header_sys_types_h_makedev+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8550,7 +8596,7 @@ $as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
 
 if test $ac_cv_header_sys_types_h_makedev = no; then
 ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then :
+if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
 
 $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
 
@@ -8560,7 +8606,7 @@ fi
 
   if test $ac_cv_header_sys_mkdev_h = no; then
     ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
 
 $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
 
@@ -8573,7 +8619,7 @@ fi
 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
@@ -8584,7 +8630,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 :
@@ -8639,7 +8685,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8714,7 +8760,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
 $as_echo_n "checking for working mktime... " >&6; }
-if test "${ac_cv_func_working_mktime+set}" = set; then :
+if ${ac_cv_func_working_mktime+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8943,7 +8989,7 @@ fi
 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
@@ -8953,7 +8999,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -9120,7 +9166,7 @@ rm -f conftest.mmap conftest.txt
 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
@@ -9131,7 +9177,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 :
@@ -9184,13 +9230,17 @@ $as_echo "#define realloc rpl_realloc" >>confdefs.h
 fi
 
 
-{ $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.  */
@@ -9239,7 +9289,7 @@ esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
 $as_echo_n "checking for working strtod... " >&6; }
-if test "${ac_cv_func_strtod+set}" = set; then :
+if ${ac_cv_func_strtod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -9298,14 +9348,14 @@ if test $ac_cv_func_strtod = no; then
 esac
 
 ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
+if test "x$ac_cv_func_pow" = xyes; then :
 
 fi
 
 if test $ac_cv_func_pow = no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
 $as_echo_n "checking for pow in -lm... " >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9339,7 +9389,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
 $as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   POW_LIB=-lm
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
@@ -9435,10 +9485,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;}
@@ -9470,7 +9531,7 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${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"
@@ -9571,6 +9632,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
@@ -9878,7 +9940,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by Xen Hypervisor $as_me 4.2, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9940,7 +10002,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Xen Hypervisor config.status 4.2
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -10064,7 +10126,7 @@ do
     "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -10086,9 +10148,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
 }
@@ -10096,12 +10159,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.
@@ -10123,7 +10187,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -10151,7 +10215,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
@@ -10199,7 +10263,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 = "\a"
 
@@ -10231,7 +10295,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
 
@@ -10265,7 +10329,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
 
@@ -10277,8 +10341,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
@@ -10379,7 +10443,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -10398,7 +10462,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 `:'.
@@ -10407,7 +10471,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -10433,8 +10497,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -10564,21 +10628,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;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
  ;;
@@ -10589,20 +10654,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
  ;;
diff --git a/tools/configure.ac b/tools/configure.ac
index 250dffd..ddabfef 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -106,6 +106,7 @@ AX_PATH_PROG_OR_FAIL([AS86], [as86])
 AX_PATH_PROG_OR_FAIL([LD86], [ld86])
 AX_PATH_PROG_OR_FAIL([BCC], [bcc])
 AX_PATH_PROG_OR_FAIL([IASL], [iasl])
+AX_PATH_PROG_OR_FAIL([FLEX], [flex])
 AX_CHECK_UUID
 AX_CHECK_CURSES
 PKG_CHECK_MODULES(glib, glib-2.0)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] configure: Check for flex
  2012-04-15 18:43 [PATCH] configure: Check for flex Jean Guyader
@ 2012-04-16  7:42 ` Ian Campbell
  2012-04-16  8:54 ` Roger Pau Monne
  1 sibling, 0 replies; 5+ messages in thread
From: Ian Campbell @ 2012-04-16  7:42 UTC (permalink / raw)
  To: Jean Guyader; +Cc: xen-devel, Roger Pau Monne

On Sun, 2012-04-15 at 19:43 +0100, Jean Guyader wrote:
> libxl require the command flex to be present.
> Verify in the configure script that the flex
> command exsits.

If only it were that simple :-/

We need a fairly recent version of flex (to avoid bugs WRT reentrancy of
the generated parsers) and this version is not in various stable
releases of common distros.

So we check in the generated files and are supposed to only rebuild them
when the source has changed. However there seems to be a bug somewhere
(probably something to do with VCS vs. timestamps) and sometime the
files get regenerated when they needn't be, at which point you need 
flex...

I think Roger Pau Monné posted a fix for all this last week.

> 
> Signed-off-by: Jean Guyader <jean.guyader@gmail.com>
> ---
>  tools/configure    |  633 +++++++++++++++++++++++++++++-----------------------
>  tools/configure.ac |    1 +
>  2 files changed, 350 insertions(+), 284 deletions(-)
> 
> diff --git a/tools/configure b/tools/configure
> index 86618f5..071adf7 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -1,6 +1,6 @@
>  #! /bin/sh
>  # Guess values for system-dependent variables and create Makefiles.
> -# Generated by GNU Autoconf 2.67 for Xen Hypervisor 4.2.
> +# Generated by GNU Autoconf 2.68 for Xen Hypervisor 4.2.
>  #
>  # Report bugs to <xen-devel@lists.xensource.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
> @@ -216,11 +217,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 :
> @@ -1164,7 +1172,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
> @@ -1490,7 +1498,7 @@ test -n "$ac_init_help" && exit $ac_status
>  if $ac_init_version; then
>    cat <<\_ACEOF
>  Xen Hypervisor configure 4.2
> -generated by GNU Autoconf 2.67
> +generated by GNU Autoconf 2.68
> 
>  Copyright (C) 2010 Free Software Foundation, Inc.
>  This configure script is free software; the Free Software Foundation
> @@ -1536,7 +1544,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
> @@ -1573,7 +1581,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
> @@ -1586,10 +1594,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
> @@ -1656,7 +1664,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"
> @@ -1665,7 +1673,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
> 
> @@ -1706,7 +1714,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
> @@ -1720,7 +1728,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
> @@ -1738,7 +1746,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
> 
> @@ -1783,11 +1791,65 @@ 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
> 
> +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
> +# -------------------------------------------
> +# Tests whether TYPE exists after having included INCLUDES, setting cache
> +# variable VAR accordingly.
> +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 \${$3+:} false; then :
> +  $as_echo_n "(cached) " >&6
> +else
> +  eval "$3=no"
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +$4
> +int
> +main ()
> +{
> +if (sizeof ($2))
> +        return 0;
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +$4
> +int
> +main ()
> +{
> +if (sizeof (($2)))
> +           return 0;
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +
> +else
> +  eval "$3=yes"
> +fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +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; ${as_lineno_stack:+:} unset as_lineno
> +
> +} # ac_fn_c_check_type
> +
>  # ac_fn_c_check_func LINENO FUNC VAR
>  # ----------------------------------
>  # Tests whether FUNC exists, setting the cache variable VAR accordingly
> @@ -1796,7 +1858,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
> @@ -1851,64 +1913,10 @@ 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
> 
> -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
> -# -------------------------------------------
> -# Tests whether TYPE exists after having included INCLUDES, setting cache
> -# variable VAR accordingly.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  eval "$3=no"
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$4
> -int
> -main ()
> -{
> -if (sizeof ($2))
> -        return 0;
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$4
> -int
> -main ()
> -{
> -if (sizeof (($2)))
> -           return 0;
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -
> -else
> -  eval "$3=yes"
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -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;}
> -
> -} # ac_fn_c_check_type
> -
>  # ac_fn_c_find_intX_t LINENO BITS VAR
>  # -----------------------------------
>  # Finds a signed integer type with width BITS, setting cache variable VAR
> @@ -1918,7 +1926,7 @@ ac_fn_c_find_intX_t ()
>    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
>    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
>  $as_echo_n "checking for int$2_t... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    eval "$3=no"
> @@ -1979,7 +1987,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_find_intX_t
> 
> @@ -1992,7 +2000,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
> @@ -2036,7 +2044,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
> 
> @@ -2049,7 +2057,7 @@ ac_fn_c_find_uintX_t ()
>    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
>    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
>  $as_echo_n "checking for uint$2_t... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    eval "$3=no"
> @@ -2089,7 +2097,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_find_uintX_t
>  cat >config.log <<_ACEOF
> @@ -2097,7 +2105,7 @@ This file contains any messages produced by compilers while
>  running configure, to aid debugging if configure makes a mistake.
> 
>  It was created by Xen Hypervisor $as_me 4.2, which was
> -generated by GNU Autoconf 2.67.  Invocation command line was
> +generated by GNU Autoconf 2.68.  Invocation command line was
> 
>    $ $0 $@
> 
> @@ -2355,7 +2363,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
>        || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "failed to load site script $ac_site_file
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>    fi
>  done
> 
> @@ -2508,7 +2516,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
> @@ -2548,7 +2556,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
> @@ -2601,7 +2609,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
> @@ -2641,7 +2649,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
> @@ -2700,7 +2708,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
> @@ -2744,7 +2752,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
> @@ -2799,7 +2807,7 @@ fi
>  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "no acceptable C compiler found in \$PATH
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> 
>  # Provide some information about the compiler.
>  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
> @@ -2914,7 +2922,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
>  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error 77 "C compiler cannot create executables
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>  $as_echo "yes" >&6; }
> @@ -2957,7 +2965,7 @@ else
>    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "cannot compute suffix of executables: cannot compile and link
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>  fi
>  rm -f conftest conftest$ac_cv_exeext
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
> @@ -3016,7 +3024,7 @@ $as_echo "$ac_try_echo"; } >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "cannot run C compiled programs.
>  If you meant to cross compile, use \`--host'.
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>      fi
>    fi
>  fi
> @@ -3027,7 +3035,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
> @@ -3068,7 +3076,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
>  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "cannot compute suffix of object files: cannot compile
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>  fi
>  rm -f conftest.$ac_cv_objext conftest.$ac_ext
>  fi
> @@ -3078,7 +3086,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
> @@ -3115,7 +3123,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
> @@ -3193,7 +3201,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
> @@ -3301,7 +3309,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
> @@ -3417,7 +3425,7 @@ else
>    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>  fi
> 
>  ac_ext=c
> @@ -3429,7 +3437,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
> 
>  { $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
> @@ -3492,7 +3500,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
> @@ -3559,7 +3567,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
> @@ -3688,7 +3696,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=
> @@ -3710,7 +3718,7 @@ $as_echo "#define _MINIX 1" >>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
> @@ -3753,7 +3761,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
> @@ -3769,7 +3777,7 @@ fi
>  $as_echo "$ac_cv_build" >&6; }
>  case $ac_cv_build in
>  *-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
> +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
>  esac
>  build=$ac_cv_build
>  ac_save_IFS=$IFS; IFS='-'
> @@ -3787,7 +3795,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
> @@ -3802,7 +3810,7 @@ fi
>  $as_echo "$ac_cv_host" >&6; }
>  case $ac_cv_host in
>  *-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
> +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
>  esac
>  host=$ac_cv_host
>  ac_save_IFS=$IFS; IFS='-'
> @@ -4196,7 +4204,7 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
>  # Checks for programs.
>  { $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/
> @@ -4273,7 +4281,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
> @@ -4313,7 +4321,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
> @@ -4366,7 +4374,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
> @@ -4406,7 +4414,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
> @@ -4465,7 +4473,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
> @@ -4509,7 +4517,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
> @@ -4564,7 +4572,7 @@ fi
>  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>  as_fn_error $? "no acceptable C compiler found in \$PATH
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> 
>  # Provide some information about the compiler.
>  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
> @@ -4593,7 +4601,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
> @@ -4630,7 +4638,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
> @@ -4708,7 +4716,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
> @@ -4818,7 +4826,7 @@ fi
>  $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
> @@ -4862,7 +4870,7 @@ fi
>  { $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
> @@ -4942,7 +4950,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>  set dummy perl; 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_PERL+set}" = set; then :
> +if ${ac_cv_path_PERL+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $PERL in
> @@ -4989,7 +4997,7 @@ if test "x$xapi" = "xy"; then :
>  set dummy curl-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_CURL+set}" = set; then :
> +if ${ac_cv_path_CURL+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $CURL in
> @@ -5034,7 +5042,7 @@ fi
>  set dummy xml2-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_XML+set}" = set; then :
> +if ${ac_cv_path_XML+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $XML in
> @@ -5085,7 +5093,7 @@ if test "x$ocamltools" = "xy"; then :
>  set dummy ${ac_tool_prefix}ocamlc; 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_OCAMLC+set}" = set; then :
> +if ${ac_cv_prog_OCAMLC+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLC"; then
> @@ -5125,7 +5133,7 @@ if test -z "$ac_cv_prog_OCAMLC"; then
>  set dummy ocamlc; 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_OCAMLC+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLC+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLC"; then
> @@ -5196,7 +5204,7 @@ $as_echo "OCaml library path is $OCAMLLIB" >&6; }
>  set dummy ${ac_tool_prefix}ocamlopt; 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_OCAMLOPT+set}" = set; then :
> +if ${ac_cv_prog_OCAMLOPT+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLOPT"; then
> @@ -5236,7 +5244,7 @@ if test -z "$ac_cv_prog_OCAMLOPT"; then
>  set dummy ocamlopt; 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_OCAMLOPT+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLOPT+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLOPT"; then
> @@ -5306,7 +5314,7 @@ $as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; }
>  set dummy ${ac_tool_prefix}ocamlc.opt; 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_OCAMLCDOTOPT+set}" = set; then :
> +if ${ac_cv_prog_OCAMLCDOTOPT+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLCDOTOPT"; then
> @@ -5346,7 +5354,7 @@ if test -z "$ac_cv_prog_OCAMLCDOTOPT"; then
>  set dummy ocamlc.opt; 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_OCAMLCDOTOPT+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLCDOTOPT+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLCDOTOPT"; then
> @@ -5410,7 +5418,7 @@ $as_echo "versions differs from ocamlc; ocamlc.opt discarded." >&6; }
>  set dummy ${ac_tool_prefix}ocamlopt.opt; 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_OCAMLOPTDOTOPT+set}" = set; then :
> +if ${ac_cv_prog_OCAMLOPTDOTOPT+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLOPTDOTOPT"; then
> @@ -5450,7 +5458,7 @@ if test -z "$ac_cv_prog_OCAMLOPTDOTOPT"; then
>  set dummy ocamlopt.opt; 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_OCAMLOPTDOTOPT+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLOPTDOTOPT+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
> @@ -5519,7 +5527,7 @@ $as_echo "version differs from ocamlc; ocamlopt.opt discarded." >&6; }
>  set dummy ${ac_tool_prefix}ocaml; 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_OCAML+set}" = set; then :
> +if ${ac_cv_prog_OCAML+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAML"; then
> @@ -5559,7 +5567,7 @@ if test -z "$ac_cv_prog_OCAML"; then
>  set dummy ocaml; 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_OCAML+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAML+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAML"; then
> @@ -5613,7 +5621,7 @@ fi
>  set dummy ${ac_tool_prefix}ocamldep; 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_OCAMLDEP+set}" = set; then :
> +if ${ac_cv_prog_OCAMLDEP+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLDEP"; then
> @@ -5653,7 +5661,7 @@ if test -z "$ac_cv_prog_OCAMLDEP"; then
>  set dummy ocamldep; 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_OCAMLDEP+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLDEP+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLDEP"; then
> @@ -5707,7 +5715,7 @@ fi
>  set dummy ${ac_tool_prefix}ocamlmktop; 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_OCAMLMKTOP+set}" = set; then :
> +if ${ac_cv_prog_OCAMLMKTOP+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLMKTOP"; then
> @@ -5747,7 +5755,7 @@ if test -z "$ac_cv_prog_OCAMLMKTOP"; then
>  set dummy ocamlmktop; 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_OCAMLMKTOP+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLMKTOP+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLMKTOP"; then
> @@ -5801,7 +5809,7 @@ fi
>  set dummy ${ac_tool_prefix}ocamlmklib; 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_OCAMLMKLIB+set}" = set; then :
> +if ${ac_cv_prog_OCAMLMKLIB+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLMKLIB"; then
> @@ -5841,7 +5849,7 @@ if test -z "$ac_cv_prog_OCAMLMKLIB"; then
>  set dummy ocamlmklib; 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_OCAMLMKLIB+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLMKLIB+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLMKLIB"; then
> @@ -5895,7 +5903,7 @@ fi
>  set dummy ${ac_tool_prefix}ocamldoc; 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_OCAMLDOC+set}" = set; then :
> +if ${ac_cv_prog_OCAMLDOC+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLDOC"; then
> @@ -5935,7 +5943,7 @@ if test -z "$ac_cv_prog_OCAMLDOC"; then
>  set dummy ocamldoc; 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_OCAMLDOC+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLDOC+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLDOC"; then
> @@ -5989,7 +5997,7 @@ fi
>  set dummy ${ac_tool_prefix}ocamlbuild; 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_OCAMLBUILD+set}" = set; then :
> +if ${ac_cv_prog_OCAMLBUILD+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$OCAMLBUILD"; then
> @@ -6029,7 +6037,7 @@ if test -z "$ac_cv_prog_OCAMLBUILD"; then
>  set dummy ocamlbuild; 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_OCAMLBUILD+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_OCAMLBUILD+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test -n "$ac_ct_OCAMLBUILD"; then
> @@ -6092,7 +6100,7 @@ fi
>  set dummy bash; 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_BASH+set}" = set; then :
> +if ${ac_cv_path_BASH+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $BASH in
> @@ -6149,7 +6157,7 @@ fi
>  set dummy $PYTHON; 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_PYTHONPATH+set}" = set; then :
> +if ${ac_cv_path_PYTHONPATH+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $PYTHONPATH in
> @@ -6225,7 +6233,7 @@ LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
>      print distutils.sysconfig.get_config_var("LDFLAGS")'`"
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
> -if test "x$ac_cv_header_Python_h" = x""yes; then :
> +if test "x$ac_cv_header_Python_h" = xyes; then :
> 
>  else
>    as_fn_error $? "Unable to find Python development headers" "$LINENO" 5
> @@ -6235,7 +6243,7 @@ fi
>  as_ac_Lib=`$as_echo "ac_cv_lib_python$ac_python_version''_PyArg_ParseTuple" | $as_tr_sh`
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyArg_ParseTuple in -lpython$ac_python_version" >&5
>  $as_echo_n "checking for PyArg_ParseTuple in -lpython$ac_python_version... " >&6; }
> -if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
> +if eval \${$as_ac_Lib+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -6290,7 +6298,7 @@ fi
>  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
> @@ -6335,7 +6343,7 @@ fi
>  set dummy as86; 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_AS86+set}" = set; then :
> +if ${ac_cv_path_AS86+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $AS86 in
> @@ -6380,7 +6388,7 @@ fi
>  set dummy ld86; 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_LD86+set}" = set; then :
> +if ${ac_cv_path_LD86+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $LD86 in
> @@ -6425,7 +6433,7 @@ fi
>  set dummy bcc; 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_BCC+set}" = set; then :
> +if ${ac_cv_path_BCC+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $BCC in
> @@ -6470,7 +6478,7 @@ fi
>  set dummy iasl; 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_IASL+set}" = set; then :
> +if ${ac_cv_path_IASL+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    case $IASL in
> @@ -6511,13 +6519,58 @@ if test x"${IASL}" == x"no"
>  then
>      as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5
>  fi
> +# Extract the first word of "flex", so it can be a program name with args.
> +set dummy flex; ac_word=$2
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> +$as_echo_n "checking for $ac_word... " >&6; }
> +if ${ac_cv_path_FLEX+:} false; then :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $FLEX in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
> +  ;;
> +  *)
> +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +for as_dir in $PATH
> +do
> +  IFS=$as_save_IFS
> +  test -z "$as_dir" && as_dir=.
> +    for ac_exec_ext in '' $ac_executable_extensions; do
> +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> +    ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
> +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> +    break 2
> +  fi
> +done
> +  done
> +IFS=$as_save_IFS
> +
> +  test -z "$ac_cv_path_FLEX" && ac_cv_path_FLEX="no"
> +  ;;
> +esac
> +fi
> +FLEX=$ac_cv_path_FLEX
> +if test -n "$FLEX"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
> +$as_echo "$FLEX" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +fi
> +
> +
> +if test x"${FLEX}" == x"no"
> +then
> +    as_fn_error $? "Unable to find flex, please install flex" "$LINENO" 5
> +fi
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
> -if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then :
> +if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
> 
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
>  $as_echo_n "checking for uuid_clear in -luuid... " >&6; }
> -if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
> +if ${ac_cv_lib_uuid_uuid_clear+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -6551,7 +6604,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_clear" >&5
>  $as_echo "$ac_cv_lib_uuid_uuid_clear" >&6; }
> -if test "x$ac_cv_lib_uuid_uuid_clear" = x""yes; then :
> +if test "x$ac_cv_lib_uuid_uuid_clear" = xyes; then :
>    libuuid="y"
>  fi
> 
> @@ -6560,7 +6613,7 @@ fi
> 
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
> -if test "x$ac_cv_header_uuid_h" = x""yes; then :
> +if test "x$ac_cv_header_uuid_h" = xyes; then :
>    libuuid="y"
>  fi
> 
> @@ -6573,11 +6626,11 @@ fi
> 
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
> -if test "x$ac_cv_header_curses_h" = x""yes; then :
> +if test "x$ac_cv_header_curses_h" = xyes; then :
> 
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clear in -lcurses" >&5
>  $as_echo_n "checking for clear in -lcurses... " >&6; }
> -if test "${ac_cv_lib_curses_clear+set}" = set; then :
> +if ${ac_cv_lib_curses_clear+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -6611,7 +6664,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_clear" >&5
>  $as_echo "$ac_cv_lib_curses_clear" >&6; }
> -if test "x$ac_cv_lib_curses_clear" = x""yes; then :
> +if test "x$ac_cv_lib_curses_clear" = xyes; then :
>    curses="y"
>  else
>    curses="n"
> @@ -6624,11 +6677,11 @@ fi
> 
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
> -if test "x$ac_cv_header_ncurses_h" = x""yes; then :
> +if test "x$ac_cv_header_ncurses_h" = xyes; then :
> 
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clear in -lncurses" >&5
>  $as_echo_n "checking for clear in -lncurses... " >&6; }
> -if test "${ac_cv_lib_ncurses_clear+set}" = set; then :
> +if ${ac_cv_lib_ncurses_clear+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -6662,7 +6715,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_clear" >&5
>  $as_echo "$ac_cv_lib_ncurses_clear" >&6; }
> -if test "x$ac_cv_lib_ncurses_clear" = x""yes; then :
> +if test "x$ac_cv_lib_ncurses_clear" = xyes; then :
>    ncurses="y"
>  else
>    ncurses="n"
> @@ -6709,7 +6762,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
>  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
> @@ -6752,7 +6805,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
> @@ -6897,7 +6950,7 @@ and glib_LIBS to avoid the need to call pkg-config.
>  See the pkg-config man page for more details.
> 
>  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>  else
>         glib_CFLAGS=$pkg_cv_glib_CFLAGS
>         glib_LIBS=$pkg_cv_glib_LIBS
> @@ -6933,11 +6986,11 @@ fi
> 
>  # Checks for libraries.
>  ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
> -if test "x$ac_cv_header_bzlib_h" = x""yes; then :
> +if test "x$ac_cv_header_bzlib_h" = xyes; then :
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompressInit in -lbz2" >&5
>  $as_echo_n "checking for BZ2_bzDecompressInit in -lbz2... " >&6; }
> -if test "${ac_cv_lib_bz2_BZ2_bzDecompressInit+set}" = set; then :
> +if ${ac_cv_lib_bz2_BZ2_bzDecompressInit+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -6971,7 +7024,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzDecompressInit" >&5
>  $as_echo "$ac_cv_lib_bz2_BZ2_bzDecompressInit" >&6; }
> -if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = x""yes; then :
> +if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = xyes; then :
>    zlib="$zlib -DHAVE_BZLIB -lbz2"
>  fi
> 
> @@ -6980,11 +7033,11 @@ fi
> 
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
> -if test "x$ac_cv_header_lzma_h" = x""yes; then :
> +if test "x$ac_cv_header_lzma_h" = xyes; then :
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_stream_decoder in -llzma" >&5
>  $as_echo_n "checking for lzma_stream_decoder in -llzma... " >&6; }
> -if test "${ac_cv_lib_lzma_lzma_stream_decoder+set}" = set; then :
> +if ${ac_cv_lib_lzma_lzma_stream_decoder+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7018,7 +7071,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_stream_decoder" >&5
>  $as_echo "$ac_cv_lib_lzma_lzma_stream_decoder" >&6; }
> -if test "x$ac_cv_lib_lzma_lzma_stream_decoder" = x""yes; then :
> +if test "x$ac_cv_lib_lzma_lzma_stream_decoder" = xyes; then :
>    zlib="$zlib -DHAVE_LZMA -llzma"
>  fi
> 
> @@ -7027,11 +7080,11 @@ fi
> 
> 
>  ac_fn_c_check_header_mongrel "$LINENO" "lzo/lzo1x.h" "ac_cv_header_lzo_lzo1x_h" "$ac_includes_default"
> -if test "x$ac_cv_header_lzo_lzo1x_h" = x""yes; then :
> +if test "x$ac_cv_header_lzo_lzo1x_h" = xyes; then :
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_decompress in -llzo2" >&5
>  $as_echo_n "checking for lzo1x_decompress in -llzo2... " >&6; }
> -if test "${ac_cv_lib_lzo2_lzo1x_decompress+set}" = set; then :
> +if ${ac_cv_lib_lzo2_lzo1x_decompress+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7065,7 +7118,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo2_lzo1x_decompress" >&5
>  $as_echo "$ac_cv_lib_lzo2_lzo1x_decompress" >&6; }
> -if test "x$ac_cv_lib_lzo2_lzo1x_decompress" = x""yes; then :
> +if test "x$ac_cv_lib_lzo2_lzo1x_decompress" = xyes; then :
>    zlib="$zlib -DHAVE_LZO1X -llzo2"
>  fi
> 
> @@ -7076,7 +7129,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5
>  $as_echo_n "checking for io_setup in -laio... " >&6; }
> -if test "${ac_cv_lib_aio_io_setup+set}" = set; then :
> +if ${ac_cv_lib_aio_io_setup+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7110,7 +7163,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_io_setup" >&5
>  $as_echo "$ac_cv_lib_aio_io_setup" >&6; }
> -if test "x$ac_cv_lib_aio_io_setup" = x""yes; then :
> +if test "x$ac_cv_lib_aio_io_setup" = xyes; then :
>    system_aio="y"
>  else
>    system_aio="n"
> @@ -7119,7 +7172,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5
>  $as_echo_n "checking for MD5 in -lcrypto... " >&6; }
> -if test "${ac_cv_lib_crypto_MD5+set}" = set; then :
> +if ${ac_cv_lib_crypto_MD5+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7153,7 +7206,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5
>  $as_echo "$ac_cv_lib_crypto_MD5" >&6; }
> -if test "x$ac_cv_lib_crypto_MD5" = x""yes; then :
> +if test "x$ac_cv_lib_crypto_MD5" = xyes; then :
>    cat >>confdefs.h <<_ACEOF
>  #define HAVE_LIBCRYPTO 1
>  _ACEOF
> @@ -7166,7 +7219,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ext2fs_open2 in -lext2fs" >&5
>  $as_echo_n "checking for ext2fs_open2 in -lext2fs... " >&6; }
> -if test "${ac_cv_lib_ext2fs_ext2fs_open2+set}" = set; then :
> +if ${ac_cv_lib_ext2fs_ext2fs_open2+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7200,7 +7253,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext2fs_ext2fs_open2" >&5
>  $as_echo "$ac_cv_lib_ext2fs_ext2fs_open2" >&6; }
> -if test "x$ac_cv_lib_ext2fs_ext2fs_open2" = x""yes; then :
> +if test "x$ac_cv_lib_ext2fs_ext2fs_open2" = xyes; then :
>    libext2fs="y"
>  else
>    libext2fs="n"
> @@ -7209,7 +7262,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_md_hash_buffer in -lgcrypt" >&5
>  $as_echo_n "checking for gcry_md_hash_buffer in -lgcrypt... " >&6; }
> -if test "${ac_cv_lib_gcrypt_gcry_md_hash_buffer+set}" = set; then :
> +if ${ac_cv_lib_gcrypt_gcry_md_hash_buffer+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7243,7 +7296,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_md_hash_buffer" >&5
>  $as_echo "$ac_cv_lib_gcrypt_gcry_md_hash_buffer" >&6; }
> -if test "x$ac_cv_lib_gcrypt_gcry_md_hash_buffer" = x""yes; then :
> +if test "x$ac_cv_lib_gcrypt_gcry_md_hash_buffer" = xyes; then :
>    libgcrypt="y"
>  else
>    libgcrypt="n"
> @@ -7253,7 +7306,7 @@ fi
> 
>      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread flag" >&5
>  $as_echo_n "checking for pthread flag... " >&6; }
> -if test "${ax_cv_pthread_flags+set}" = set; then :
> +if ${ax_cv_pthread_flags+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
> 
> @@ -7317,7 +7370,7 @@ $as_echo "$ax_cv_pthread_flags" >&6; }
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
>  $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
> -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
> +if ${ac_cv_lib_rt_clock_gettime+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7351,7 +7404,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
>  $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
> -if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
> +if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
>    cat >>confdefs.h <<_ACEOF
>  #define HAVE_LIBRT 1
>  _ACEOF
> @@ -7362,7 +7415,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5
>  $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
> -if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then :
> +if ${ac_cv_lib_yajl_yajl_alloc+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7396,7 +7449,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_yajl_yajl_alloc" >&5
>  $as_echo "$ac_cv_lib_yajl_yajl_alloc" >&6; }
> -if test "x$ac_cv_lib_yajl_yajl_alloc" = x""yes; then :
> +if test "x$ac_cv_lib_yajl_yajl_alloc" = xyes; then :
>    cat >>confdefs.h <<_ACEOF
>  #define HAVE_LIBYAJL 1
>  _ACEOF
> @@ -7409,7 +7462,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflateCopy in -lz" >&5
>  $as_echo_n "checking for deflateCopy in -lz... " >&6; }
> -if test "${ac_cv_lib_z_deflateCopy+set}" = set; then :
> +if ${ac_cv_lib_z_deflateCopy+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7443,7 +7496,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflateCopy" >&5
>  $as_echo "$ac_cv_lib_z_deflateCopy" >&6; }
> -if test "x$ac_cv_lib_z_deflateCopy" = x""yes; then :
> +if test "x$ac_cv_lib_z_deflateCopy" = xyes; then :
>    cat >>confdefs.h <<_ACEOF
>  #define HAVE_LIBZ 1
>  _ACEOF
> @@ -7456,7 +7509,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
>  $as_echo_n "checking for libiconv_open in -liconv... " >&6; }
> -if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then :
> +if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -7490,7 +7543,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
>  $as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; }
> -if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then :
> +if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then :
>    libiconv="y"
>  else
>    libiconv="n"
> @@ -7499,11 +7552,22 @@ fi
> 
> 
>  # Checks for header files.
> +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
> @@ -7536,7 +7600,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
> @@ -7555,7 +7619,7 @@ else
>   #pragma alloca
>  #   else
>  #    ifndef alloca /* predefined by HP cc +Olibcalls */
> -char *alloca ();
> +void *alloca (size_t);
>  #    endif
>  #   endif
>  #  endif
> @@ -7599,7 +7663,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
> @@ -7640,7 +7704,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 :
> @@ -7711,7 +7775,7 @@ done
>  # Checks for typedefs, structures, and compiler characteristics.
>  { $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
> @@ -7743,7 +7807,7 @@ else
>         char b[false == 0 ? 1 : -1];
>         char c[__bool_true_false_are_defined == 1 ? 1 : -1];
>         char d[(bool) 0.5 == true ? 1 : -1];
> -       bool e = &s;
> +       /* See body of main program for 'e'.  */
>         char f[(_Bool) 0.0 == false ? 1 : -1];
>         char g[true];
>         char h[sizeof (_Bool)];
> @@ -7754,25 +7818,6 @@ else
>         _Bool n[m];
>         char o[sizeof n == m * sizeof n[0] ? 1 : -1];
>         char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
> -#      if defined __xlc__ || defined __GNUC__
> -        /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
> -           reported by James Lemley on 2005-10-05; see
> -           http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
> -           This test is not quite right, since xlc is allowed to
> -           reject this program, as the initializer for xlcbug is
> -           not one of the forms that C requires support for.
> -           However, doing the test right would require a runtime
> -           test, and that would make cross-compilation harder.
> -           Let us hope that IBM fixes the xlc bug, and also adds
> -           support for this kind of constant expression.  In the
> -           meantime, this test will reject xlc, which is OK, since
> -           our stdbool.h substitute should suffice.  We also test
> -           this with GCC, where it should work, to detect more
> -           quickly whether someone messes up the test in the
> -           future.  */
> -        char digs[] = "0123456789";
> -        int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
> -#      endif
>         /* Catch a bug in an HP-UX C compiler.  See
>            http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
>            http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
> @@ -7784,6 +7829,7 @@ int
>  main ()
>  {
> 
> +       bool e = &s;
>         *pq |= q;
>         *pq |= ! q;
>         /* Refer to every declared value, to avoid compiler optimizations.  */
> @@ -7804,7 +7850,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
> @@ -7821,7 +7867,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
> @@ -7851,7 +7897,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
> @@ -7936,7 +7982,7 @@ _ACEOF
>  esac
> 
>  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
> 
> @@ -7947,7 +7993,7 @@ _ACEOF
>  fi
> 
>  ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
> -if test "x$ac_cv_type_off_t" = x""yes; then :
> +if test "x$ac_cv_type_off_t" = xyes; then :
> 
>  else
> 
> @@ -7958,7 +8004,7 @@ _ACEOF
>  fi
> 
>  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
> -if test "x$ac_cv_type_pid_t" = x""yes; then :
> +if test "x$ac_cv_type_pid_t" = xyes; then :
> 
>  else
> 
> @@ -7970,7 +8016,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
> @@ -8015,7 +8061,7 @@ _ACEOF
>   esac
> 
>  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 :
> +if test "x$ac_cv_type_size_t" = xyes; then :
> 
>  else
> 
> @@ -8026,7 +8072,7 @@ _ACEOF
>  fi
> 
>  ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
> -if test "x$ac_cv_type_ssize_t" = x""yes; then :
> +if test "x$ac_cv_type_ssize_t" = xyes; then :
> 
>  else
> 
> @@ -8037,7 +8083,7 @@ _ACEOF
>  fi
> 
>  ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
> -if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
> +if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
> 
>  cat >>confdefs.h <<_ACEOF
>  #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
> @@ -8047,7 +8093,7 @@ _ACEOF
>  fi
> 
>  ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
> -if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then :
> +if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
> 
>  cat >>confdefs.h <<_ACEOF
>  #define HAVE_STRUCT_STAT_ST_BLOCKS 1
> @@ -8067,7 +8113,7 @@ fi
> 
> 
>  ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
> -if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
> +if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
> 
>  cat >>confdefs.h <<_ACEOF
>  #define HAVE_STRUCT_STAT_ST_RDEV 1
> @@ -8131,7 +8177,7 @@ _ACEOF
>    esac
> 
>  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 :
> 
>  cat >>confdefs.h <<_ACEOF
>  #define HAVE_PTRDIFF_T 1
> @@ -8144,7 +8190,7 @@ fi
>  # Checks for library functions.
>  { $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
> @@ -8180,7 +8226,7 @@ fi
>  for ac_header in vfork.h
>  do :
>    ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
> -if test "x$ac_cv_header_vfork_h" = x""yes; then :
> +if test "x$ac_cv_header_vfork_h" = xyes; then :
>    cat >>confdefs.h <<_ACEOF
>  #define HAVE_VFORK_H 1
>  _ACEOF
> @@ -8204,7 +8250,7 @@ done
>  if test "x$ac_cv_func_fork" = xyes; then
>    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
>  $as_echo_n "checking for working fork... " >&6; }
> -if test "${ac_cv_func_fork_works+set}" = set; then :
> +if ${ac_cv_func_fork_works+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test "$cross_compiling" = yes; then :
> @@ -8257,7 +8303,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork
>  if test "x$ac_cv_func_vfork" = xyes; then
>    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
>  $as_echo_n "checking for working vfork... " >&6; }
> -if test "${ac_cv_func_vfork_works+set}" = set; then :
> +if ${ac_cv_func_vfork_works+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test "$cross_compiling" = yes; then :
> @@ -8392,7 +8438,7 @@ fi
> 
>  { $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
> @@ -8460,7 +8506,7 @@ fi
> 
>  { $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 "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
> +if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    rm -f conftest.sym conftest.file
> @@ -8522,7 +8568,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
>  $as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
> -if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then :
> +if ${ac_cv_header_sys_types_h_makedev+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -8550,7 +8596,7 @@ $as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
> 
>  if test $ac_cv_header_sys_types_h_makedev = no; then
>  ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
> -if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then :
> +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
> 
>  $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
> 
> @@ -8560,7 +8606,7 @@ fi
> 
>    if test $ac_cv_header_sys_mkdev_h = no; then
>      ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
> -if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
> +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
> 
>  $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
> 
> @@ -8573,7 +8619,7 @@ fi
>  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
> @@ -8584,7 +8630,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 :
> @@ -8639,7 +8685,7 @@ fi
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
>  $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
> -if test "${ac_cv_header_time+set}" = set; then :
> +if ${ac_cv_header_time+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -8714,7 +8760,7 @@ done
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
>  $as_echo_n "checking for working mktime... " >&6; }
> -if test "${ac_cv_func_working_mktime+set}" = set; then :
> +if ${ac_cv_func_working_mktime+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test "$cross_compiling" = yes; then :
> @@ -8943,7 +8989,7 @@ fi
>  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
> @@ -8953,7 +8999,7 @@ done
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
>  $as_echo_n "checking for working mmap... " >&6; }
> -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
> +if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test "$cross_compiling" = yes; then :
> @@ -9120,7 +9166,7 @@ rm -f conftest.mmap conftest.txt
>  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
> @@ -9131,7 +9177,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 :
> @@ -9184,13 +9230,17 @@ $as_echo "#define realloc rpl_realloc" >>confdefs.h
>  fi
> 
> 
> -{ $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.  */
> @@ -9239,7 +9289,7 @@ esac
> 
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
>  $as_echo_n "checking for working strtod... " >&6; }
> -if test "${ac_cv_func_strtod+set}" = set; then :
> +if ${ac_cv_func_strtod+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    if test "$cross_compiling" = yes; then :
> @@ -9298,14 +9348,14 @@ if test $ac_cv_func_strtod = no; then
>  esac
> 
>  ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
> -if test "x$ac_cv_func_pow" = x""yes; then :
> +if test "x$ac_cv_func_pow" = xyes; then :
> 
>  fi
> 
>  if test $ac_cv_func_pow = no; then
>    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
>  $as_echo_n "checking for pow in -lm... " >&6; }
> -if test "${ac_cv_lib_m_pow+set}" = set; then :
> +if ${ac_cv_lib_m_pow+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> @@ -9339,7 +9389,7 @@ LIBS=$ac_check_lib_save_LIBS
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
>  $as_echo "$ac_cv_lib_m_pow" >&6; }
> -if test "x$ac_cv_lib_m_pow" = x""yes; then :
> +if test "x$ac_cv_lib_m_pow" = xyes; then :
>    POW_LIB=-lm
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
> @@ -9435,10 +9485,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;}
> @@ -9470,7 +9531,7 @@ LTLIBOBJS=$ac_ltlibobjs
> 
> 
> 
> -: ${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"
> @@ -9571,6 +9632,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
> @@ -9878,7 +9940,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
>  # values after options handling.
>  ac_log="
>  This file was extended by Xen Hypervisor $as_me 4.2, which was
> -generated by GNU Autoconf 2.67.  Invocation command line was
> +generated by GNU Autoconf 2.68.  Invocation command line was
> 
>    CONFIG_FILES    = $CONFIG_FILES
>    CONFIG_HEADERS  = $CONFIG_HEADERS
> @@ -9940,7 +10002,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
>  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
>  ac_cs_version="\\
>  Xen Hypervisor config.status 4.2
> -configured by $0, generated by GNU Autoconf 2.67,
> +configured by $0, generated by GNU Autoconf 2.68,
>    with options \\"\$ac_cs_config\\"
> 
>  Copyright (C) 2010 Free Software Foundation, Inc.
> @@ -10064,7 +10126,7 @@ do
>      "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
>      "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
> 
> -  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
> +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
>    esac
>  done
> 
> @@ -10086,9 +10148,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
>  }
> @@ -10096,12 +10159,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.
> @@ -10123,7 +10187,7 @@ else
>    ac_cs_awk_cr=$ac_cr
>  fi
> 
> -echo 'BEGIN {' >"$tmp/subs1.awk" &&
> +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
>  _ACEOF
> 
> 
> @@ -10151,7 +10215,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
> @@ -10199,7 +10263,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 = "\a"
> 
> @@ -10231,7 +10295,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
> 
> @@ -10265,7 +10329,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
> 
> @@ -10277,8 +10341,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
> @@ -10379,7 +10443,7 @@ do
>    esac
>    case $ac_mode$ac_tag in
>    :[FHL]*:*);;
> -  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
> +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
>    :[FH]-) ac_tag=-:-;;
>    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
>    esac
> @@ -10398,7 +10462,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 `:'.
> @@ -10407,7 +10471,7 @@ do
>            [\\/$]*) false;;
>            *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
>            esac ||
> -          as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
> +          as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
>        esac
>        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
>        as_fn_append ac_file_inputs " '$ac_f'"
> @@ -10433,8 +10497,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
>      esac
> 
>      case $ac_tag in
> -    *:-:* | *:-) cat >"$tmp/stdin" \
> -      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
> +    *:-:* | *:-) cat >"$ac_tmp/stdin" \
> +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
>      esac
>      ;;
>    esac
> @@ -10564,21 +10628,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
>  s&@INSTALL@&$ac_INSTALL&;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
>   ;;
> @@ -10589,20 +10654,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
>   ;;
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 250dffd..ddabfef 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -106,6 +106,7 @@ AX_PATH_PROG_OR_FAIL([AS86], [as86])
>  AX_PATH_PROG_OR_FAIL([LD86], [ld86])
>  AX_PATH_PROG_OR_FAIL([BCC], [bcc])
>  AX_PATH_PROG_OR_FAIL([IASL], [iasl])
> +AX_PATH_PROG_OR_FAIL([FLEX], [flex])
>  AX_CHECK_UUID
>  AX_CHECK_CURSES
>  PKG_CHECK_MODULES(glib, glib-2.0)
> --
> 1.7.9.5
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] configure: Check for flex
  2012-04-15 18:43 [PATCH] configure: Check for flex Jean Guyader
  2012-04-16  7:42 ` Ian Campbell
@ 2012-04-16  8:54 ` Roger Pau Monne
  2012-04-24 16:25   ` Ian Jackson
  1 sibling, 1 reply; 5+ messages in thread
From: Roger Pau Monne @ 2012-04-16  8:54 UTC (permalink / raw)
  To: Jean Guyader; +Cc: xen-devel

El 15/04/2012, a las 19:43, Jean Guyader escribió:
> libxl require the command flex to be present.
> Verify in the configure script that the flex
> command exsits.
> 
> Signed-off-by: Jean Guyader <jean.guyader@gmail.com>


I've already sent a patch for this, detecting and setting Flex and Bison at configure, and printing a pretty error message if libxl needs them and they are not found:

http://lists.xen.org/archives/html/xen-devel/2012-04/msg00923.html

I've been able to build xen without Flex or Bison, so I'm not sure if we should enforce them to be present on the system.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] configure: Check for flex
  2012-04-16  8:54 ` Roger Pau Monne
@ 2012-04-24 16:25   ` Ian Jackson
  2012-04-24 16:35     ` Roger Pau Monne
  0 siblings, 1 reply; 5+ messages in thread
From: Ian Jackson @ 2012-04-24 16:25 UTC (permalink / raw)
  To: Roger Pau Monne; +Cc: xen-devel, Jean Guyader

Roger Pau Monne writes ("Re: [Xen-devel] [PATCH] configure: Check for flex"):
> El 15/04/2012, a las 19:43, Jean Guyader escribió:
> > libxl require the command flex to be present.
> > Verify in the configure script that the flex
> > command exsits.
> > 
> > Signed-off-by: Jean Guyader <jean.guyader@gmail.com>
> 
> 
> I've already sent a patch for this, detecting and setting Flex and Bison at configure, and printing a pretty error message if libxl needs them and they are not found:
> 
> http://lists.xen.org/archives/html/xen-devel/2012-04/msg00923.html

(I'm afraid that patch is still in my (enormous) backlog, but:)

I'm not very convinced that that patch is an improvement.  All it
does, effectively, is change the error message from "flex: not found"
to a custom one which effectively says "I couldn't find flex".

If flex is not available, and the timestamps indicate the file needs
to be rebuilt, we have two choices, corresponding to two possible
situations:
  1. Assume that the problem is simply timestamp skew, and allow
     the build to continue without regenerating the file (although
     we should probably print a warning)
  2. Assume that the user has edited (or patched) the flex source
     code, and stop with an error

Of these I think 1. is preferable.  In the latter case, if the user
edited it themselves they will hopefully be reading the make output
and see the warning; whereas if the user applied a patch, the patch
should update the flex output too.

In practice we update these files rarely and of course we always
commit a corresponding change.  So doing 1. will only adversely affect
a small minority of developers.  Whereas doing 2. seems to cause
regular annoyance to many people who don't necessarily know what's
going on.

Ian.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] configure: Check for flex
  2012-04-24 16:25   ` Ian Jackson
@ 2012-04-24 16:35     ` Roger Pau Monne
  0 siblings, 0 replies; 5+ messages in thread
From: Roger Pau Monne @ 2012-04-24 16:35 UTC (permalink / raw)
  To: Ian Jackson; +Cc: xen-devel, Jean Guyader

Ian Jackson escribió:
> Roger Pau Monne writes ("Re: [Xen-devel] [PATCH] configure: Check for flex"):
>> El 15/04/2012, a las 19:43, Jean Guyader escribió:
>>> libxl require the command flex to be present.
>>> Verify in the configure script that the flex
>>> command exsits.
>>>
>>> Signed-off-by: Jean Guyader<jean.guyader@gmail.com>
>>
>> I've already sent a patch for this, detecting and setting Flex and Bison at configure, and printing a pretty error message if libxl needs them and they are not found:
>>
>> http://lists.xen.org/archives/html/xen-devel/2012-04/msg00923.html
>
> (I'm afraid that patch is still in my (enormous) backlog, but:)
>
> I'm not very convinced that that patch is an improvement.  All it
> does, effectively, is change the error message from "flex: not found"
> to a custom one which effectively says "I couldn't find flex".

It also adds automatic detection of flex/bison from configure, so if the 
user has those installed, and they are needed, the compilation will not 
fail (without this patch the compilation will just fail).

> If flex is not available, and the timestamps indicate the file needs
> to be rebuilt, we have two choices, corresponding to two possible
> situations:
>    1. Assume that the problem is simply timestamp skew, and allow
>       the build to continue without regenerating the file (although
>       we should probably print a warning)
>    2. Assume that the user has edited (or patched) the flex source
>       code, and stop with an error
>
> Of these I think 1. is preferable.  In the latter case, if the user
> edited it themselves they will hopefully be reading the make output
> and see the warning; whereas if the user applied a patch, the patch
> should update the flex output too.
>
> In practice we update these files rarely and of course we always
> commit a corresponding change.  So doing 1. will only adversely affect
> a small minority of developers.  Whereas doing 2. seems to cause
> regular annoyance to many people who don't necessarily know what's
> going on.
>
> Ian.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-04-24 16:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-15 18:43 [PATCH] configure: Check for flex Jean Guyader
2012-04-16  7:42 ` Ian Campbell
2012-04-16  8:54 ` Roger Pau Monne
2012-04-24 16:25   ` Ian Jackson
2012-04-24 16:35     ` Roger Pau Monne

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.