[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH 04/25] autoconf: trim the configure script; use autoheader



On Wed, 2012-04-25 at 16:55 +0100, Ian Jackson wrote:
> Remove a lot of unnecessary tests.  Specifically, we no longer test
> for standard POSIX facilities which we expect to be provided
> everywhere and which we don't in any case have any alternative for.
> 
> Switch to generating config.h.in with autoheader.
> 
> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> 
> Changes since v7:
>  * Removed AX_CHECK_PTYFUNCS (snuck in from previous patch)
> ---
>  autogen.sh         |    1 +
>  tools/config.h.in  |   73 +-
>  tools/configure    | 8825 
> +++++++++++++++++-----------------------------------
>  tools/configure.ac |   60 +-
>  4 files changed, 2981 insertions(+), 5978 deletions(-)
> 
> diff --git a/autogen.sh b/autogen.sh
> index c288b71..58a71ce 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -1,3 +1,4 @@
>  #!/bin/sh -e
>  cd tools
>  autoconf
> +autoheader
> diff --git a/tools/config.h.in b/tools/config.h.in
> index f8f96dc..17c8913 100644
> --- a/tools/config.h.in
> +++ b/tools/config.h.in
> @@ -1,19 +1,64 @@
> -/*
> - * Copyright (C) 2012
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU Lesser General Public License as published
> - * by the Free Software Foundation; version 2.1 only. with the special
> - * exception on linking described in file LICENSE.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU Lesser General Public License for more details.
> - */
> +/* config.h.in.  Generated from configure.ac by autoheader.  */
> +
> +/* Define to 1 if you have the <inttypes.h> header file. */
> +#undef HAVE_INTTYPES_H
> +
> +/* Define to 1 if you have the `crypto' library (-lcrypto). */
> +#undef HAVE_LIBCRYPTO
> +
> +/* Define to 1 if you have the `yajl' library (-lyajl). */
> +#undef HAVE_LIBYAJL
> +
> +/* Define to 1 if you have the `z' library (-lz). */
> +#undef HAVE_LIBZ
> +
> +/* Define to 1 if you have the <memory.h> header file. */
> +#undef HAVE_MEMORY_H
> +
> +/* Define to 1 if you have the <stdint.h> header file. */
> +#undef HAVE_STDINT_H
> +
> +/* Define to 1 if you have the <stdlib.h> header file. */
> +#undef HAVE_STDLIB_H
> +
> +/* Define to 1 if you have the <strings.h> header file. */
> +#undef HAVE_STRINGS_H
> +
> +/* Define to 1 if you have the <string.h> header file. */
> +#undef HAVE_STRING_H
> +
> +/* Define to 1 if you have the <sys/stat.h> header file. */
> +#undef HAVE_SYS_STAT_H
> +
> +/* Define to 1 if you have the <sys/types.h> header file. */
> +#undef HAVE_SYS_TYPES_H
> +
> +/* Define to 1 if you have the <unistd.h> header file. */
> +#undef HAVE_UNISTD_H
> 
>  /* Define to 1 if you have the <yajl/yajl_version.h> header file. */
>  #undef HAVE_YAJL_YAJL_VERSION_H
> 
> -/* Define curses header to include. */
> +/* Define curses header to use */
>  #undef INCLUDE_CURSES_H
> +
> +/* Define to the address where bug reports for this package should be sent. 
> */
> +#undef PACKAGE_BUGREPORT
> +
> +/* Define to the full name of this package. */
> +#undef PACKAGE_NAME
> +
> +/* Define to the full name and version of this package. */
> +#undef PACKAGE_STRING
> +
> +/* Define to the one symbol short name of this package. */
> +#undef PACKAGE_TARNAME
> +
> +/* Define to the home page for this package. */
> +#undef PACKAGE_URL
> +
> +/* Define to the version of this package. */
> +#undef PACKAGE_VERSION
> +
> +/* Define to 1 if you have the ANSI C header files. */
> +#undef STDC_HEADERS
> diff --git a/tools/configure b/tools/configure
> index 897e061..d8918fe 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -595,12 +595,8 @@ ac_includes_default="\
>  # include <unistd.h>
>  #endif"
> 
> -ac_header_list=
> -ac_func_list=
>  ac_subst_vars='LTLIBOBJS
> -POW_LIB
>  LIBOBJS
> -ALLOCA
>  libiconv
>  PTHREAD_LIBS
>  PTHREAD_LDFLAGS
> @@ -616,6 +612,9 @@ PKG_CONFIG_LIBDIR
>  PKG_CONFIG_PATH
>  PKG_CONFIG
>  CURSES_LIBS
> +EGREP
> +GREP
> +CPP
>  pyconfig
>  PYTHONPATH
>  OCAMLBUILD
> @@ -635,8 +634,13 @@ INSTALL_DATA
>  INSTALL_SCRIPT
>  INSTALL_PROGRAM
>  SET_MAKE
> -LN_S
> -SED
> +OBJEXT
> +EXEEXT
> +ac_ct_CC
> +CPPFLAGS
> +LDFLAGS
> +CFLAGS
> +CC
>  IASL
>  BCC
>  LD86
> @@ -665,24 +669,6 @@ xenapi
>  vtpm
>  monitors
>  githttp
> -host_os
> -host_vendor
> -host_cpu
> -host
> -build_os
> -build_vendor
> -build_cpu
> -build
> -EGREP
> -GREP
> -CPP
> -OBJEXT
> -EXEEXT
> -ac_ct_CC
> -CPPFLAGS
> -LDFLAGS
> -CFLAGS
> -CC
>  target_alias
>  host_alias
>  build_alias
> @@ -740,12 +726,6 @@ enable_debug
>        ac_precious_vars='build_alias
>  host_alias
>  target_alias
> -CC
> -CFLAGS
> -LDFLAGS
> -LIBS
> -CPPFLAGS
> -CPP
>  PREPEND_INCLUDES
>  PREPEND_LIB
>  APPEND_INCLUDES
> @@ -762,6 +742,12 @@ AS86
>  LD86
>  BCC
>  IASL
> +CC
> +CFLAGS
> +LDFLAGS
> +LIBS
> +CPPFLAGS
> +CPP
>  PKG_CONFIG
>  PKG_CONFIG_PATH
>  PKG_CONFIG_LIBDIR
> @@ -1365,10 +1351,6 @@ Fine tuning of the installation directories:
>  _ACEOF
> 
>    cat <<\_ACEOF
> -
> -System types:
> -  --build=BUILD     configure for building on BUILD [guessed]
> -  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
>  _ACEOF
>  fi
> 
> @@ -1399,14 +1381,6 @@ Optional Features:
>    --disable-debug         Disable debug build of tools (default is ENABLED)
> 
>  Some influential environment variables:
> -  CC          C compiler command
> -  CFLAGS      C compiler flags
> -  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
> -              nonstandard directory <lib dir>
> -  LIBS        libraries to pass to the linker, e.g. -l<library>
> -  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
> -              you have headers in a nonstandard directory <include dir>
> -  CPP         C preprocessor
>    PREPEND_INCLUDES
>                List of include folders to prepend to CFLAGS (without -I)
>    PREPEND_LIB List of library folders to prepend to LDFLAGS (without -L)
> @@ -1425,6 +1399,14 @@ Some influential environment variables:
>    LD86        Path to ld86 tool
>    BCC         Path to bcc tool
>    IASL        Path to iasl tool
> +  CC          C compiler command
> +  CFLAGS      C compiler flags
> +  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
> +              nonstandard directory <lib dir>
> +  LIBS        libraries to pass to the linker, e.g. -l<library>
> +  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
> +              you have headers in a nonstandard directory <include dir>
> +  CPP         C preprocessor
>    PKG_CONFIG  path to pkg-config utility
>    PKG_CONFIG_PATH
>                directories to add to pkg-config's search path
> @@ -1797,311 +1779,6 @@ fi
>    as_fn_set_status $ac_retval
> 
>  } # ac_fn_c_try_link
> -
> -# ac_fn_c_check_func LINENO FUNC VAR
> -# ----------------------------------
> -# Tests whether FUNC exists, setting the cache variable VAR accordingly
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
> -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
> -#define $2 innocuous_$2
> -
> -/* System header to define __stub macros and hopefully few prototypes,
> -    which can conflict with char $2 (); below.
> -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> -    <limits.h> exists even on freestanding compilers.  */
> -
> -#ifdef __STDC__
> -# include <limits.h>
> -#else
> -# include <assert.h>
> -#endif
> -
> -#undef $2
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char $2 ();
> -/* The GNU C library defines this for functions which it implements
> -    to always fail with ENOSYS.  Some functions are actually named
> -    something starting with __ and the normal name is an alias.  */
> -#if defined __stub_$2 || defined __stub___$2
> -choke me
> -#endif
> -
> -int
> -main ()
> -{
> -return $2 ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  eval "$3=yes"
> -else
> -  eval "$3=no"
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext 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_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
> -# accordingly.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  eval "$3=no"
> -     # Order is important - never check a type that is potentially smaller
> -     # than half of the expected target width.
> -     for ac_type in int$2_t 'int' 'long int' \
> -        'long long int' 'short int' 'signed char'; do
> -       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$ac_includes_default
> -            enum { N = $2 / 2 - 1 };
> -int
> -main ()
> -{
> -static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) 
> - 1) * 2 + 1))];
> -test_array [0] = 0
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$ac_includes_default
> -               enum { N = $2 / 2 - 1 };
> -int
> -main ()
> -{
> -static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 
> 1) * 2 + 1)
> -                < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
> -test_array [0] = 0
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -
> -else
> -  case $ac_type in #(
> -  int$2_t) :
> -    eval "$3=yes" ;; #(
> -  *) :
> -    eval "$3=\$ac_type" ;;
> -esac
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -       if eval test \"x\$"$3"\" = x"no"; then :
> -
> -else
> -  break
> -fi
> -     done
> -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_find_intX_t
> -
> -# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
> -# ----------------------------------------------------
> -# Tries to find if the field MEMBER exists in type AGGR, after including
> -# INCLUDES, setting cache variable VAR accordingly.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$5
> -int
> -main ()
> -{
> -static $2 ac_aggr;
> -if (ac_aggr.$3)
> -return 0;
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  eval "$4=yes"
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$5
> -int
> -main ()
> -{
> -static $2 ac_aggr;
> -if (sizeof ac_aggr.$3)
> -return 0;
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  eval "$4=yes"
> -else
> -  eval "$4=no"
> -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=\$$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;}
> -
> -} # ac_fn_c_check_member
> -
> -# ac_fn_c_find_uintX_t LINENO BITS VAR
> -# ------------------------------------
> -# Finds an unsigned integer type with width BITS, setting cache variable VAR
> -# accordingly.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  eval "$3=no"
> -     # Order is important - never check a type that is potentially smaller
> -     # than half of the expected target width.
> -     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
> -        'unsigned long long int' 'unsigned short int' 'unsigned char'; do
> -       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$ac_includes_default
> -int
> -main ()
> -{
> -static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 
> - 1) == 3)];
> -test_array [0] = 0
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  case $ac_type in #(
> -  uint$2_t) :
> -    eval "$3=yes" ;; #(
> -  *) :
> -    eval "$3=\$ac_type" ;;
> -esac
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -       if eval test \"x\$"$3"\" = x"no"; then :
> -
> -else
> -  break
> -fi
> -     done
> -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_find_uintX_t
>  cat >config.log <<_ACEOF
>  This file contains any messages produced by compilers while
>  running configure, to aid debugging if configure makes a mistake.
> @@ -2386,11 +2063,6 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
>    >$cache_file
>  fi
> 
> -as_fn_append ac_header_list " sys/time.h"
> -as_fn_append ac_header_list " unistd.h"
> -as_fn_append ac_func_list " alarm"
> -as_fn_append ac_header_list " stdlib.h"
> -as_fn_append ac_header_list " sys/param.h"
>  # Check that the precious variables saved in the cache have kept the same
>  # value.
>  ac_cache_corrupted=false
> @@ -2508,1730 +2180,40 @@ APPEND_INCLUDES and APPEND_LIB instead when 
> possible." >&2;}
> 
>  fi
> 
> -ac_ext=c
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> -ac_compiler_gnu=$ac_cv_c_compiler_gnu
> -if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program 
> name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -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_prog_CC="${ac_tool_prefix}gcc"
> -    $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
> -
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -
> -fi
> -if test -z "$ac_cv_prog_CC"; then
> -  ac_ct_CC=$CC
> -  # Extract the first word of "gcc", so it can be a program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$ac_ct_CC"; then
> -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
> -else
> -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_prog_ac_ct_CC="gcc"
> -    $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
> -
> -fi
> -fi
> -ac_ct_CC=$ac_cv_prog_ac_ct_CC
> -if test -n "$ac_ct_CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> -$as_echo "$ac_ct_CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -  if test "x$ac_ct_CC" = x; then
> -    CC=""
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    CC=$ac_ct_CC
> -  fi
> -else
> -  CC="$ac_cv_prog_CC"
> -fi
> -
> -if test -z "$CC"; then
> -          if test -n "$ac_tool_prefix"; then
> -    # Extract the first word of "${ac_tool_prefix}cc", so it can be a 
> program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -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_prog_CC="${ac_tool_prefix}cc"
> -    $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
> -
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -
> -  fi
> -fi
> -if test -z "$CC"; then
> -  # Extract the first word of "cc", so it can be a program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -  ac_prog_rejected=no
> -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
> -    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
> -       ac_prog_rejected=yes
> -       continue
> -     fi
> -    ac_cv_prog_CC="cc"
> -    $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
> -
> -if test $ac_prog_rejected = yes; then
> -  # We found a bogon in the path, so make sure we never use it.
> -  set dummy $ac_cv_prog_CC
> -  shift
> -  if test $# != 0; then
> -    # We chose a different compiler from the bogus one.
> -    # However, it has the same basename, so the bogon will be chosen
> -    # first if we set CC to just the basename; use the full file name.
> -    shift
> -    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
> -  fi
> -fi
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -
> -fi
> -if test -z "$CC"; then
> -  if test -n "$ac_tool_prefix"; then
> -  for ac_prog in cl.exe
> -  do
> -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a 
> program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -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_prog_CC="$ac_tool_prefix$ac_prog"
> -    $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
> -
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -
> -    test -n "$CC" && break
> -  done
> -fi
> -if test -z "$CC"; then
> -  ac_ct_CC=$CC
> -  for ac_prog in cl.exe
> -do
> -  # Extract the first word of "$ac_prog", so it can be a program name with 
> args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$ac_ct_CC"; then
> -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
> -else
> -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_prog_ac_ct_CC="$ac_prog"
> -    $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
> -
> -fi
> -fi
> -ac_ct_CC=$ac_cv_prog_ac_ct_CC
> -if test -n "$ac_ct_CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> -$as_echo "$ac_ct_CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -
> -  test -n "$ac_ct_CC" && break
> -done
> -
> -  if test "x$ac_ct_CC" = x; then
> -    CC=""
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    CC=$ac_ct_CC
> -  fi
> -fi
> -
> -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 ; }
> -
> -# Provide some information about the compiler.
> -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
> -set X $ac_compile
> -ac_compiler=$2
> -for ac_option in --version -v -V -qversion; do
> -  { { ac_try="$ac_compiler $ac_option >&5"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
> -  ac_status=$?
> -  if test -s conftest.err; then
> -    sed '10a\
> -... rest of stderr output deleted ...
> -         10q' conftest.err >conftest.er1
> -    cat conftest.er1 >&5
> -  fi
> -  rm -f conftest.er1 conftest.err
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }
> -done
> -
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -ac_clean_files_save=$ac_clean_files
> -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
> -# Try to create an executable without -o first, disregard a.out.
> -# It will help us diagnose broken compilers, and finding out an intuition
> -# of exeext.
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler 
> works" >&5
> -$as_echo_n "checking whether the C compiler works... " >&6; }
> -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
> -
> -# The possible output files:
> -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
> -
> -ac_rmfiles=
> -for ac_file in $ac_files
> -do
> -  case $ac_file in
> -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
> -    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
> -  esac
> -done
> -rm -f $ac_rmfiles
> -
> -if { { ac_try="$ac_link_default"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_link_default") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }; then :
> -  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
> -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
> -# in a Makefile.  We should not override ac_cv_exeext if it was cached,
> -# so that the user can short-circuit this test for compilers unknown to
> -# Autoconf.
> -for ac_file in $ac_files ''
> -do
> -  test -f "$ac_file" || continue
> -  case $ac_file in
> -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM | *.o | *.obj )
> -       ;;
> -    [ab].out )
> -       # We found the default executable, but exeext='' is most
> -       # certainly right.
> -       break;;
> -    *.* )
> -       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
> -       then :; else
> -          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
> -       fi
> -       # We set ac_cv_exeext here because the later test for it is not
> -       # safe: cross compilers may not add the suffix if given an `-o'
> -       # argument, so we may need to know it at that point already.
> -       # Even if this section looks crufty: it has the advantage of
> -       # actually working.
> -       break;;
> -    * )
> -       break;;
> -  esac
> -done
> -test "$ac_cv_exeext" = no && ac_cv_exeext=
> -
> -else
> -  ac_file=''
> -fi
> -if test -z "$ac_file"; then :
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -$as_echo "$as_me: failed program was:" >&5
> -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 ; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> -$as_echo "yes" >&6; }
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default 
> output file name" >&5
> -$as_echo_n "checking for C compiler default output file name... " >&6; }
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
> -$as_echo "$ac_file" >&6; }
> -ac_exeext=$ac_cv_exeext
> -
> -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
> -ac_clean_files=$ac_clean_files_save
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" 
> >&5
> -$as_echo_n "checking for suffix of executables... " >&6; }
> -if { { ac_try="$ac_link"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_link") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }; then :
> -  # If both `conftest.exe' and `conftest' are `present' (well, observable)
> -# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
> -# work properly (i.e., refer to `conftest.exe'), while it won't with
> -# `rm'.
> -for ac_file in conftest.exe conftest conftest.*; do
> -  test -f "$ac_file" || continue
> -  case $ac_file in
> -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
> -    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
> -         break;;
> -    * ) break;;
> -  esac
> -done
> -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 ; }
> -fi
> -rm -f conftest conftest$ac_cv_exeext
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
> -$as_echo "$ac_cv_exeext" >&6; }
> -
> -rm -f conftest.$ac_ext
> -EXEEXT=$ac_cv_exeext
> -ac_exeext=$EXEEXT
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <stdio.h>
> -int
> -main ()
> -{
> -FILE *f = fopen ("conftest.out", "w");
> - return ferror (f) || fclose (f) != 0;
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -ac_clean_files="$ac_clean_files conftest.out"
> -# Check that the compiler produces executables we can run.  If not, either
> -# the compiler is broken, or we cross compile.
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross 
> compiling" >&5
> -$as_echo_n "checking whether we are cross compiling... " >&6; }
> -if test "$cross_compiling" != yes; then
> -  { { ac_try="$ac_link"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_link") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }
> -  if { ac_try='./conftest$ac_cv_exeext'
> -  { { case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_try") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }; }; then
> -    cross_compiling=no
> -  else
> -    if test "$cross_compiling" = maybe; then
> -       cross_compiling=yes
> -    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 run C compiled programs.
> -If you meant to cross compile, use \`--host'.
> -See \`config.log' for more details" "$LINENO" 5 ; }
> -    fi
> -  fi
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
> -$as_echo "$cross_compiling" >&6; }
> -
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -rm -f conftest.o conftest.obj
> -if { { ac_try="$ac_compile"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_compile") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }; then :
> -  for ac_file in conftest.o conftest.obj conftest.*; do
> -  test -f "$ac_file" || continue;
> -  case $ac_file in
> -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM ) ;;
> -    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
> -       break;;
> -  esac
> -done
> -else
> -  $as_echo "$as_me: failed program was:" >&5
> -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 ; }
> -fi
> -rm -f conftest.$ac_cv_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
> -$as_echo "$ac_cv_objext" >&6; }
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -int
> -main ()
> -{
> -#ifndef __GNUC__
> -       choke me
> -#endif
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_compiler_gnu=yes
> -else
> -  ac_compiler_gnu=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -ac_cv_c_compiler_gnu=$ac_compiler_gnu
> -
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
> -$as_echo "$ac_cv_c_compiler_gnu" >&6; }
> -if test $ac_compiler_gnu = yes; then
> -  GCC=yes
> -else
> -  GCC=
> -fi
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_save_c_werror_flag=$ac_c_werror_flag
> -   ac_c_werror_flag=yes
> -   ac_cv_prog_cc_g=no
> -   CFLAGS="-g"
> -   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_prog_cc_g=yes
> -else
> -  CFLAGS=""
> -      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -
> -else
> -  ac_c_werror_flag=$ac_save_c_werror_flag
> -        CFLAGS="-g"
> -        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_prog_cc_g=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
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -   ac_c_werror_flag=$ac_save_c_werror_flag
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
> -$as_echo "$ac_cv_prog_cc_g" >&6; }
> -if test "$ac_test_CFLAGS" = set; then
> -  CFLAGS=$ac_save_CFLAGS
> -elif test $ac_cv_prog_cc_g = yes; then
> -  if test "$GCC" = yes; then
> -    CFLAGS="-g -O2"
> -  else
> -    CFLAGS="-g"
> -  fi
> -else
> -  if test "$GCC" = yes; then
> -    CFLAGS="-O2"
> -  else
> -    CFLAGS=
> -  fi
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_cv_prog_cc_c89=no
> -ac_save_CC=$CC
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <stdarg.h>
> -#include <stdio.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
> -struct buf { int x; };
> -FILE * (*rcsopen) (struct buf *, struct stat *, int);
> -static char *e (p, i)
> -     char **p;
> -     int i;
> -{
> -  return p[i];
> -}
> -static char *f (char * (*g) (char **, int), char **p, ...)
> -{
> -  char *s;
> -  va_list v;
> -  va_start (v,p);
> -  s = g (p, va_arg (v,int));
> -  va_end (v);
> -  return s;
> -}
> -
> -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
> -   function prototypes and stuff, but not '\xHH' hex character constants.
> -   These don't provoke an error unfortunately, instead are silently treated
> -   as 'x'.  The following induces an error, until -std is added to get
> -   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
> -   array size at least.  It's necessary to write '\x00'==0 to get something
> -   that's true only with -std.  */
> -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
> -
> -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro 
> parameters
> -   inside strings and character constants.  */
> -#define FOO(x) 'x'
> -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
> -
> -int test (int i, double x);
> -struct s1 {int (*f) (int a);};
> -struct s2 {int (*f) (double a);};
> -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), 
> int, int);
> -int argc;
> -char **argv;
> -int
> -main ()
> -{
> -return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
> -       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
> -do
> -  CC="$ac_save_CC $ac_arg"
> -  if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_prog_cc_c89=$ac_arg
> -fi
> -rm -f core conftest.err conftest.$ac_objext
> -  test "x$ac_cv_prog_cc_c89" != "xno" && break
> -done
> -rm -f conftest.$ac_ext
> -CC=$ac_save_CC
> -
> -fi
> -# AC_CACHE_VAL
> -case "x$ac_cv_prog_cc_c89" in
> -  x)
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
> -$as_echo "none needed" >&6; } ;;
> -  xno)
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
> -$as_echo "unsupported" >&6; } ;;
> -  *)
> -    CC="$CC $ac_cv_prog_cc_c89"
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
> -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
> -esac
> -if test "x$ac_cv_prog_cc_c89" != xno; then :
> -
> -fi
> -
> -ac_ext=c
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> -ac_compiler_gnu=$ac_cv_c_compiler_gnu
> -
> -
> -ac_ext=c
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> -ac_compiler_gnu=$ac_cv_c_compiler_gnu
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C 
> preprocessor" >&5
> -$as_echo_n "checking how to run the C preprocessor... " >&6; }
> -# On Suns, sometimes $CPP names a directory.
> -if test -n "$CPP" && test -d "$CPP"; then
> -  CPP=
> -fi
> -if test -z "$CPP"; then
> -  if test "${ac_cv_prog_CPP+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -      # Double quotes because CPP needs to be expanded
> -    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
> -    do
> -      ac_preproc_ok=false
> -for ac_c_preproc_warn_flag in '' yes
> -do
> -  # Use a header file that comes with gcc, so configuring glibc
> -  # with a fresh cross-compiler works.
> -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> -  # <limits.h> exists even on freestanding compilers.
> -  # On the NeXT, cc -E runs the code through the compiler's parser,
> -  # not just through cpp. "Syntax error" is here to catch this case.
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#ifdef __STDC__
> -# include <limits.h>
> -#else
> -# include <assert.h>
> -#endif
> -                    Syntax error
> -_ACEOF
> -if ac_fn_c_try_cpp "$LINENO"; then :
> -
> -else
> -  # Broken: fails on valid input.
> -continue
> -fi
> -rm -f conftest.err conftest.i conftest.$ac_ext
> -
> -  # OK, works on sane cases.  Now check whether nonexistent headers
> -  # can be detected and how.
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <ac_nonexistent.h>
> -_ACEOF
> -if ac_fn_c_try_cpp "$LINENO"; then :
> -  # Broken: success on invalid input.
> -continue
> -else
> -  # Passes both tests.
> -ac_preproc_ok=:
> -break
> -fi
> -rm -f conftest.err conftest.i conftest.$ac_ext
> -
> -done
> -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
> -rm -f conftest.i conftest.err conftest.$ac_ext
> -if $ac_preproc_ok; then :
> -  break
> -fi
> -
> -    done
> -    ac_cv_prog_CPP=$CPP
> -
> -fi
> -  CPP=$ac_cv_prog_CPP
> -else
> -  ac_cv_prog_CPP=$CPP
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
> -$as_echo "$CPP" >&6; }
> -ac_preproc_ok=false
> -for ac_c_preproc_warn_flag in '' yes
> -do
> -  # Use a header file that comes with gcc, so configuring glibc
> -  # with a fresh cross-compiler works.
> -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> -  # <limits.h> exists even on freestanding compilers.
> -  # On the NeXT, cc -E runs the code through the compiler's parser,
> -  # not just through cpp. "Syntax error" is here to catch this case.
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#ifdef __STDC__
> -# include <limits.h>
> -#else
> -# include <assert.h>
> -#endif
> -                    Syntax error
> -_ACEOF
> -if ac_fn_c_try_cpp "$LINENO"; then :
> -
> -else
> -  # Broken: fails on valid input.
> -continue
> -fi
> -rm -f conftest.err conftest.i conftest.$ac_ext
> -
> -  # OK, works on sane cases.  Now check whether nonexistent headers
> -  # can be detected and how.
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <ac_nonexistent.h>
> -_ACEOF
> -if ac_fn_c_try_cpp "$LINENO"; then :
> -  # Broken: success on invalid input.
> -continue
> -else
> -  # Passes both tests.
> -ac_preproc_ok=:
> -break
> -fi
> -rm -f conftest.err conftest.i conftest.$ac_ext
> -
> -done
> -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
> -rm -f conftest.i conftest.err conftest.$ac_ext
> -if $ac_preproc_ok; then :
> -
> -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 ; }
> -fi
> -
> -ac_ext=c
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -z "$GREP"; then
> -  ac_path_GREP_found=false
> -  # Loop through the user's path and test for each of PROGNAME-LIST
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
> -do
> -  IFS=$as_save_IFS
> -  test -z "$as_dir" && as_dir=.
> -    for ac_prog in grep ggrep; do
> -    for ac_exec_ext in '' $ac_executable_extensions; do
> -      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
> -      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
> -# Check for GNU ac_path_GREP and select it if it is found.
> -  # Check for GNU $ac_path_GREP
> -case `"$ac_path_GREP" --version 2>&1` in
> -*GNU*)
> -  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
> -*)
> -  ac_count=0
> -  $as_echo_n 0123456789 >"conftest.in"
> -  while :
> -  do
> -    cat "conftest.in" "conftest.in" >"conftest.tmp"
> -    mv "conftest.tmp" "conftest.in"
> -    cp "conftest.in" "conftest.nl"
> -    $as_echo 'GREP' >> "conftest.nl"
> -    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" 
> >"conftest.out" 2>/dev/null || break
> -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
> -    as_fn_arith $ac_count + 1 && ac_count=$as_val
> -    if test $ac_count -gt ${ac_path_GREP_max-0}; then
> -      # Best one so far, save it but keep looking for a better one
> -      ac_cv_path_GREP="$ac_path_GREP"
> -      ac_path_GREP_max=$ac_count
> -    fi
> -    # 10*(2^10) chars as input seems more than enough
> -    test $ac_count -gt 10 && break
> -  done
> -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
> -esac
> -
> -      $ac_path_GREP_found && break 3
> -    done
> -  done
> -  done
> -IFS=$as_save_IFS
> -  if test -z "$ac_cv_path_GREP"; then
> -    as_fn_error $? "no acceptable grep could be found in 
> $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
> -  fi
> -else
> -  ac_cv_path_GREP=$GREP
> -fi
> -
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
> -$as_echo "$ac_cv_path_GREP" >&6; }
> - GREP="$ac_cv_path_GREP"
> -
> -
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
> -   then ac_cv_path_EGREP="$GREP -E"
> -   else
> -     if test -z "$EGREP"; then
> -  ac_path_EGREP_found=false
> -  # Loop through the user's path and test for each of PROGNAME-LIST
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
> -do
> -  IFS=$as_save_IFS
> -  test -z "$as_dir" && as_dir=.
> -    for ac_prog in egrep; do
> -    for ac_exec_ext in '' $ac_executable_extensions; do
> -      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
> -      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || 
> continue
> -# Check for GNU ac_path_EGREP and select it if it is found.
> -  # Check for GNU $ac_path_EGREP
> -case `"$ac_path_EGREP" --version 2>&1` in
> -*GNU*)
> -  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
> -*)
> -  ac_count=0
> -  $as_echo_n 0123456789 >"conftest.in"
> -  while :
> -  do
> -    cat "conftest.in" "conftest.in" >"conftest.tmp"
> -    mv "conftest.tmp" "conftest.in"
> -    cp "conftest.in" "conftest.nl"
> -    $as_echo 'EGREP' >> "conftest.nl"
> -    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || 
> break
> -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
> -    as_fn_arith $ac_count + 1 && ac_count=$as_val
> -    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
> -      # Best one so far, save it but keep looking for a better one
> -      ac_cv_path_EGREP="$ac_path_EGREP"
> -      ac_path_EGREP_max=$ac_count
> -    fi
> -    # 10*(2^10) chars as input seems more than enough
> -    test $ac_count -gt 10 && break
> -  done
> -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
> -esac
> -
> -      $ac_path_EGREP_found && break 3
> -    done
> -  done
> -  done
> -IFS=$as_save_IFS
> -  if test -z "$ac_cv_path_EGREP"; then
> -    as_fn_error $? "no acceptable egrep could be found in 
> $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
> -  fi
> -else
> -  ac_cv_path_EGREP=$EGREP
> -fi
> -
> -   fi
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
> -$as_echo "$ac_cv_path_EGREP" >&6; }
> - EGREP="$ac_cv_path_EGREP"
> -
> -
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <stdlib.h>
> -#include <stdarg.h>
> -#include <string.h>
> -#include <float.h>
> -
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_header_stdc=yes
> -else
> -  ac_cv_header_stdc=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -
> -if test $ac_cv_header_stdc = yes; then
> -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <string.h>
> -
> -_ACEOF
> -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> -  $EGREP "memchr" >/dev/null 2>&1; then :
> -
> -else
> -  ac_cv_header_stdc=no
> -fi
> -rm -f conftest*
> -
> -fi
> -
> -if test $ac_cv_header_stdc = yes; then
> -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <stdlib.h>
> -
> -_ACEOF
> -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> -  $EGREP "free" >/dev/null 2>&1; then :
> -
> -else
> -  ac_cv_header_stdc=no
> -fi
> -rm -f conftest*
> -
> -fi
> -
> -if test $ac_cv_header_stdc = yes; then
> -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
> -  if test "$cross_compiling" = yes; then :
> -  :
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <ctype.h>
> -#include <stdlib.h>
> -#if ((' ' & 0x0FF) == 0x020)
> -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
> -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
> -#else
> -# define ISLOWER(c) \
> -                  (('a' <= (c) && (c) <= 'i') \
> -                    || ('j' <= (c) && (c) <= 'r') \
> -                    || ('s' <= (c) && (c) <= 'z'))
> -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
> -#endif
> -
> -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
> -int
> -main ()
> -{
> -  int i;
> -  for (i = 0; i < 256; i++)
> -    if (XOR (islower (i), ISLOWER (i))
> -       || toupper (i) != TOUPPER (i))
> -      return 2;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -
> -else
> -  ac_cv_header_stdc=no
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> -fi
> -
> -fi
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
> -$as_echo "$ac_cv_header_stdc" >&6; }
> -if test $ac_cv_header_stdc = yes; then
> -
> -$as_echo "#define STDC_HEADERS 1" >>confdefs.h
> -
> -fi
> -
> -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
> -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h 
> \
> -                 inttypes.h stdint.h unistd.h
> -do :
> -  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" 
> "$ac_includes_default
> -"
> -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
> -  cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> -_ACEOF
> -
> -fi
> -
> -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 :
> -  MINIX=yes
> -else
> -  MINIX=
> -fi
> -
> -
> -  if test "$MINIX" = yes; then
> -
> -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
> -
> -
> -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
> -
> -
> -$as_echo "#define _MINIX 1" >>confdefs.h
> -
> -  fi
> -
> -
> -  { $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -#        define __EXTENSIONS__ 1
> -         $ac_includes_default
> -int
> -main ()
> -{
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_safe_to_define___extensions__=yes
> -else
> -  ac_cv_safe_to_define___extensions__=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_safe_to_define___extensions__" >&5
> -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
> -  test $ac_cv_safe_to_define___extensions__ = yes &&
> -    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
> -
> -  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
> -
> -  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
> -
> -  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
> -
> -  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
> -
> -
> -# Make sure we can run config.sub.
> -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
> -  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
> -
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_build_alias=$build_alias
> -test "x$ac_build_alias" = x &&
> -  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
> -test "x$ac_build_alias" = x &&
> -  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
> -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
> -  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" 
> "$LINENO" 5
> -
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
> -$as_echo "$ac_cv_build" >&6; }
> -case $ac_cv_build in
> -*-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
> -esac
> -build=$ac_cv_build
> -ac_save_IFS=$IFS; IFS='-'
> -set x $ac_cv_build
> -shift
> -build_cpu=$1
> -build_vendor=$2
> -shift; shift
> -# Remember, the first character of IFS is used to create $*,
> -# except with old shells:
> -build_os=$*
> -IFS=$ac_save_IFS
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test "x$host_alias" = x; then
> -  ac_cv_host=$ac_cv_build
> -else
> -  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
> -    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" 
> "$LINENO" 5
> -fi
> -
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
> -$as_echo "$ac_cv_host" >&6; }
> -case $ac_cv_host in
> -*-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
> -esac
> -host=$ac_cv_host
> -ac_save_IFS=$IFS; IFS='-'
> -set x $ac_cv_host
> -shift
> -host_cpu=$1
> -host_vendor=$2
> -shift; shift
> -# Remember, the first character of IFS is used to create $*,
> -# except with old shells:
> -host_os=$*
> -IFS=$ac_save_IFS
> -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
> -
> -
> -
> -# M4 Macro includes
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf 
> -*-
> -# serial 1 (pkg-config-0.24)
> -#
> -# Copyright  2004 Scott James Remnant <scott@xxxxxxxxxxxx>.
> -#
> -# This program is free software; you can redistribute it and/or modify
> -# it under the terms of the GNU General Public License as published by
> -# the Free Software Foundation; either version 2 of the License, or
> -# (at your option) any later version.
> -#
> -# This program is distributed in the hope that it will be useful, but
> -# WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -# General Public License for more details.
> -#
> -# You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> -#
> -# As a special exception to the GNU General Public License, if you
> -# distribute this file as part of a program that contains a
> -# configuration script generated by Autoconf, you may include it under
> -# the same distribution terms that you use for the rest of that program.
> -
> -# PKG_PROG_PKG_CONFIG([MIN-VERSION])
> -# ----------------------------------
> -# PKG_PROG_PKG_CONFIG
> -
> -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
> -#
> -# Check to see whether a particular set of modules exists.  Similar
> -# to PKG_CHECK_MODULES(), but does not set variables or print errors.
> -#
> -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> -# only at the first occurence in configure.ac, so if the first place
> -# it's called might be skipped (such as if it is within an "if", you
> -# have to call PKG_CHECK_EXISTS manually
> -# --------------------------------------------------------------
> -
> -
> -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
> -# ---------------------------------------------
> -# _PKG_CONFIG
> -
> -# _PKG_SHORT_ERRORS_SUPPORTED
> -# -----------------------------
> -# _PKG_SHORT_ERRORS_SUPPORTED
> -
> -
> -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
> -# [ACTION-IF-NOT-FOUND])
> -#
> -#
> -# Note that if there is a possibility the first call to
> -# PKG_CHECK_MODULES might not happen, you should be sure to include an
> -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
> -#
> -#
> -# --------------------------------------------------------------
> -# PKG_CHECK_MODULES
> -
> -
> -
> -# We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS
> -# even though currently we don't set them very separately.
> -# This means that the makefiles will not need to change in
> -# the future if we make the test more sophisticated.
> -
> -
> -
> -# We invoke AX_PTHREAD_VARS with the name of another macro
> -# which is then expanded once for each variable.
> -
> -
> -
> -
> -
> -
> -
> -
> -# Enable/disable options
> -
> -# Check whether --enable-githttp was given.
> -if test "${enable_githttp+set}" = set; then :
> -  enableval=$enable_githttp;
> -fi
> -
> -
> -if test "x$enable_githttp" = "xno"; then :
> -
> -    ax_cv_githttp="n"
> -
> -elif test "x$enable_githttp" = "xyes"; then :
> -
> -    ax_cv_githttp="y"
> -
> -elif test -z $ax_cv_githttp; then :
> -
> -    ax_cv_githttp="n"
> -
> -fi
> -githttp=$ax_cv_githttp
> -
> -
> -
> -# Check whether --enable-monitors was given.
> -if test "${enable_monitors+set}" = set; then :
> -  enableval=$enable_monitors;
> -fi
> -
> -
> -if test "x$enable_monitors" = "xno"; then :
> -
> -    ax_cv_monitors="n"
> -
> -elif test "x$enable_monitors" = "xyes"; then :
> -
> -    ax_cv_monitors="y"
> -
> -elif test -z $ax_cv_monitors; then :
> -
> -    ax_cv_monitors="y"
> -
> -fi
> -monitors=$ax_cv_monitors
> -
> -
> -
> -# Check whether --enable-vtpm was given.
> -if test "${enable_vtpm+set}" = set; then :
> -  enableval=$enable_vtpm;
> -fi
> -
> -
> -if test "x$enable_vtpm" = "xno"; then :
> -
> -    ax_cv_vtpm="n"
> -
> -elif test "x$enable_vtpm" = "xyes"; then :
> -
> -    ax_cv_vtpm="y"
> -
> -elif test -z $ax_cv_vtpm; then :
> -
> -    ax_cv_vtpm="n"
> -
> -fi
> -vtpm=$ax_cv_vtpm
> -
> -
> -
> -# Check whether --enable-xenapi was given.
> -if test "${enable_xenapi+set}" = set; then :
> -  enableval=$enable_xenapi;
> -fi
> -
> -
> -if test "x$enable_xenapi" = "xno"; then :
> -
> -    ax_cv_xenapi="n"
> -
> -elif test "x$enable_xenapi" = "xyes"; then :
> -
> -    ax_cv_xenapi="y"
> -
> -elif test -z $ax_cv_xenapi; then :
> -
> -    ax_cv_xenapi="n"
> -
> -fi
> -xenapi=$ax_cv_xenapi
> -
> -
> -
> -# Check whether --enable-pythontools was given.
> -if test "${enable_pythontools+set}" = set; then :
> -  enableval=$enable_pythontools;
> -fi
> -
> -
> -if test "x$enable_pythontools" = "xno"; then :
> -
> -    ax_cv_pythontools="n"
> -
> -elif test "x$enable_pythontools" = "xyes"; then :
> -
> -    ax_cv_pythontools="y"
> -
> -elif test -z $ax_cv_pythontools; then :
> -
> -    ax_cv_pythontools="y"
> -
> -fi
> -pythontools=$ax_cv_pythontools
> -
> -
> -
> -# Check whether --enable-ocamltools was given.
> -if test "${enable_ocamltools+set}" = set; then :
> -  enableval=$enable_ocamltools;
> -fi
> -
> -
> -if test "x$enable_ocamltools" = "xno"; then :
> -
> -    ax_cv_ocamltools="n"
> -
> -elif test "x$enable_ocamltools" = "xyes"; then :
> -
> -    ax_cv_ocamltools="y"
> -
> -elif test -z $ax_cv_ocamltools; then :
> -
> -    ax_cv_ocamltools="y"
> -
> -fi
> -ocamltools=$ax_cv_ocamltools
> -
> -
> -
> -# Check whether --enable-miniterm was given.
> -if test "${enable_miniterm+set}" = set; then :
> -  enableval=$enable_miniterm;
> -fi
> -
> -
> -if test "x$enable_miniterm" = "xno"; then :
> -
> -    ax_cv_miniterm="n"
> -
> -elif test "x$enable_miniterm" = "xyes"; then :
> -
> -    ax_cv_miniterm="y"
> -
> -elif test -z $ax_cv_miniterm; then :
> -
> -    ax_cv_miniterm="n"
> -
> -fi
> -miniterm=$ax_cv_miniterm
> -
> -
> -
> -# Check whether --enable-lomount was given.
> -if test "${enable_lomount+set}" = set; then :
> -  enableval=$enable_lomount;
> -fi
> -
> -
> -if test "x$enable_lomount" = "xno"; then :
> -
> -    ax_cv_lomount="n"
> -
> -elif test "x$enable_lomount" = "xyes"; then :
> -
> -    ax_cv_lomount="y"
> -
> -elif test -z $ax_cv_lomount; then :
> -
> -    ax_cv_lomount="n"
> -
> -fi
> -lomount=$ax_cv_lomount
> -
> -
> -
> -# Check whether --enable-ovmf was given.
> -if test "${enable_ovmf+set}" = set; then :
> -  enableval=$enable_ovmf;
> -fi
> -
> -
> -if test "x$enable_ovmf" = "xno"; then :
> -
> -    ax_cv_ovmf="n"
> -
> -elif test "x$enable_ovmf" = "xyes"; then :
> -
> -    ax_cv_ovmf="y"
> -
> -elif test -z $ax_cv_ovmf; then :
> -
> -    ax_cv_ovmf="n"
> -
> -fi
> -ovmf=$ax_cv_ovmf
> +# M4 Macro includes
> 
> 
> 
> -# Check whether --enable-rombios was given.
> -if test "${enable_rombios+set}" = set; then :
> -  enableval=$enable_rombios;
> -fi
> 
> 
> -if test "x$enable_rombios" = "xno"; then :
> 
> -    ax_cv_rombios="n"
> 
> -elif test "x$enable_rombios" = "xyes"; then :
> 
> -    ax_cv_rombios="y"
> 
> -elif test -z $ax_cv_rombios; then :
> 
> -    ax_cv_rombios="y"
> 
> -fi
> -rombios=$ax_cv_rombios
> 
> 
> 
> -# Check whether --enable-seabios was given.
> -if test "${enable_seabios+set}" = set; then :
> -  enableval=$enable_seabios;
> -fi
> 
> 
> -if test "x$enable_seabios" = "xno"; then :
> 
> -    ax_cv_seabios="n"
> 
> -elif test "x$enable_seabios" = "xyes"; then :
> 
> -    ax_cv_seabios="y"
> 
> -elif test -z $ax_cv_seabios; then :
> 
> -    ax_cv_seabios="y"
> 
> -fi
> -seabios=$ax_cv_seabios
> 
> 
> 
> -# Check whether --enable-debug was given.
> -if test "${enable_debug+set}" = set; then :
> -  enableval=$enable_debug;
> -fi
> 
> 
> -if test "x$enable_debug" = "xno"; then :
> 
> -    ax_cv_debug="n"
> 
> -elif test "x$enable_debug" = "xyes"; then :
> 
> -    ax_cv_debug="y"
> 
> -elif test -z $ax_cv_debug; then :
> 
> -    ax_cv_debug="y"
> 
> -fi
> -debug=$ax_cv_debug
> 
> 
> 
> @@ -4240,930 +2222,432 @@ debug=$ax_cv_debug
> 
> 
> 
> -for cflag in $PREPEND_INCLUDES
> -do
> -    PREPEND_CFLAGS+=" -I$cflag"
> -done
> -for ldflag in $PREPEND_LIB
> -do
> -    PREPEND_LDFLAGS+=" -L$ldflag"
> -done
> -for cflag in $APPEND_INCLUDES
> -do
> -    APPEND_CFLAGS+=" -I$cflag"
> -done
> -for ldflag in $APPEND_LIB
> -do
> -    APPEND_LDFLAGS+=" -L$ldflag"
> -done
> -CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS"
> -LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
> 
> 
> 
> 
> 
> 
> +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf 
> -*-
> +# serial 1 (pkg-config-0.24)
> +#
> +# Copyright  2004 Scott James Remnant <scott@xxxxxxxxxxxx>.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful, but
> +# WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +# General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> +#
> +# As a special exception to the GNU General Public License, if you
> +# distribute this file as part of a program that contains a
> +# configuration script generated by Autoconf, you may include it under
> +# the same distribution terms that you use for the rest of that program.
> 
> +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
> +# ----------------------------------
> +# PKG_PROG_PKG_CONFIG
> 
> +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
> +#
> +# Check to see whether a particular set of modules exists.  Similar
> +# to PKG_CHECK_MODULES(), but does not set variables or print errors.
> +#
> +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> +# only at the first occurence in configure.ac, so if the first place
> +# it's called might be skipped (such as if it is within an "if", you
> +# have to call PKG_CHECK_EXISTS manually
> +# --------------------------------------------------------------
> 
> 
> +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
> +# ---------------------------------------------
> +# _PKG_CONFIG
> 
> +# _PKG_SHORT_ERRORS_SUPPORTED
> +# -----------------------------
> +# _PKG_SHORT_ERRORS_SUPPORTED
> 
> 
> +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
> +# [ACTION-IF-NOT-FOUND])
> +#
> +#
> +# Note that if there is a possibility the first call to
> +# PKG_CHECK_MODULES might not happen, you should be sure to include an
> +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
> +#
> +#
> +# --------------------------------------------------------------
> +# PKG_CHECK_MODULES
> 
> -# 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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -            
> ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
> -     for ac_i in 1 2 3 4 5 6 7; do
> -       ac_script="$ac_script$as_nl$ac_script"
> -     done
> -     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
> -     { ac_script=; unset ac_script;}
> -     if test -z "$SED"; then
> -  ac_path_SED_found=false
> -  # Loop through the user's path and test for each of PROGNAME-LIST
> -  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_prog in sed gsed; do
> -    for ac_exec_ext in '' $ac_executable_extensions; do
> -      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
> -      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
> -# Check for GNU ac_path_SED and select it if it is found.
> -  # Check for GNU $ac_path_SED
> -case `"$ac_path_SED" --version 2>&1` in
> -*GNU*)
> -  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
> -*)
> -  ac_count=0
> -  $as_echo_n 0123456789 >"conftest.in"
> -  while :
> -  do
> -    cat "conftest.in" "conftest.in" >"conftest.tmp"
> -    mv "conftest.tmp" "conftest.in"
> -    cp "conftest.in" "conftest.nl"
> -    $as_echo '' >> "conftest.nl"
> -    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 
> 2>/dev/null || break
> -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
> -    as_fn_arith $ac_count + 1 && ac_count=$as_val
> -    if test $ac_count -gt ${ac_path_SED_max-0}; then
> -      # Best one so far, save it but keep looking for a better one
> -      ac_cv_path_SED="$ac_path_SED"
> -      ac_path_SED_max=$ac_count
> -    fi
> -    # 10*(2^10) chars as input seems more than enough
> -    test $ac_count -gt 10 && break
> -  done
> -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
> -esac
> 
> -      $ac_path_SED_found && break 3
> -    done
> -  done
> -  done
> -IFS=$as_save_IFS
> -  if test -z "$ac_cv_path_SED"; then
> -    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
> -  fi
> -else
> -  ac_cv_path_SED=$SED
> -fi
> 
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
> -$as_echo "$ac_cv_path_SED" >&6; }
> - SED="$ac_cv_path_SED"
> -  rm -f conftest.sed
> +# We define, separately, PTHREAD_CFLAGS, _LDFLAGS and _LIBS
> +# even though currently we don't set them very separately.
> +# This means that the makefiles will not need to change in
> +# the future if we make the test more sophisticated.
> 
> -ac_ext=c
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> -ac_compiler_gnu=$ac_cv_c_compiler_gnu
> -if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program 
> name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -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_prog_CC="${ac_tool_prefix}gcc"
> -    $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
> 
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> 
> +# We invoke AX_PTHREAD_VARS with the name of another macro
> +# which is then expanded once for each variable.
> 
> -fi
> -if test -z "$ac_cv_prog_CC"; then
> -  ac_ct_CC=$CC
> -  # Extract the first word of "gcc", so it can be a program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$ac_ct_CC"; then
> -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
> -else
> -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_prog_ac_ct_CC="gcc"
> -    $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
> 
> -fi
> -fi
> -ac_ct_CC=$ac_cv_prog_ac_ct_CC
> -if test -n "$ac_ct_CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> -$as_echo "$ac_ct_CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> 
> -  if test "x$ac_ct_CC" = x; then
> -    CC=""
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    CC=$ac_ct_CC
> -  fi
> -else
> -  CC="$ac_cv_prog_CC"
> -fi
> 
> -if test -z "$CC"; then
> -          if test -n "$ac_tool_prefix"; then
> -    # Extract the first word of "${ac_tool_prefix}cc", so it can be a 
> program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -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_prog_CC="${ac_tool_prefix}cc"
> -    $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
> 
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> 
> 
> -  fi
> -fi
> -if test -z "$CC"; then
> -  # Extract the first word of "cc", so it can be a program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -  ac_prog_rejected=no
> -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
> -    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
> -       ac_prog_rejected=yes
> -       continue
> -     fi
> -    ac_cv_prog_CC="cc"
> -    $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
> 
> -if test $ac_prog_rejected = yes; then
> -  # We found a bogon in the path, so make sure we never use it.
> -  set dummy $ac_cv_prog_CC
> -  shift
> -  if test $# != 0; then
> -    # We chose a different compiler from the bogus one.
> -    # However, it has the same basename, so the bogon will be chosen
> -    # first if we set CC to just the basename; use the full file name.
> -    shift
> -    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
> -  fi
> -fi
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> +# Enable/disable options
> +
> +# Check whether --enable-githttp was given.
> +if test "${enable_githttp+set}" = set; then :
> +  enableval=$enable_githttp;
>  fi
> 
> 
> -fi
> -if test -z "$CC"; then
> -  if test -n "$ac_tool_prefix"; then
> -  for ac_prog in cl.exe
> -  do
> -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a 
> program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$CC"; then
> -  ac_cv_prog_CC="$CC" # Let the user override the test.
> -else
> -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_prog_CC="$ac_tool_prefix$ac_prog"
> -    $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
> +if test "x$enable_githttp" = "xno"; then :
> 
> -fi
> -fi
> -CC=$ac_cv_prog_CC
> -if test -n "$CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> -$as_echo "$CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> +    ax_cv_githttp="n"
> 
> +elif test "x$enable_githttp" = "xyes"; then :
> 
> -    test -n "$CC" && break
> -  done
> -fi
> -if test -z "$CC"; then
> -  ac_ct_CC=$CC
> -  for ac_prog in cl.exe
> -do
> -  # Extract the first word of "$ac_prog", so it can be a program name with 
> args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$ac_ct_CC"; then
> -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
> -else
> -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_prog_ac_ct_CC="$ac_prog"
> -    $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
> +    ax_cv_githttp="y"
> +
> +elif test -z $ax_cv_githttp; then :
> +
> +    ax_cv_githttp="n"
> 
>  fi
> -fi
> -ac_ct_CC=$ac_cv_prog_ac_ct_CC
> -if test -n "$ac_ct_CC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> -$as_echo "$ac_ct_CC" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> +githttp=$ax_cv_githttp
> 
> 
> -  test -n "$ac_ct_CC" && break
> -done
> 
> -  if test "x$ac_ct_CC" = x; then
> -    CC=""
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    CC=$ac_ct_CC
> -  fi
> +# Check whether --enable-monitors was given.
> +if test "${enable_monitors+set}" = set; then :
> +  enableval=$enable_monitors;
>  fi
> 
> -fi
> 
> +if test "x$enable_monitors" = "xno"; then :
> 
> -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 ; }
> +    ax_cv_monitors="n"
> 
> -# Provide some information about the compiler.
> -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
> -set X $ac_compile
> -ac_compiler=$2
> -for ac_option in --version -v -V -qversion; do
> -  { { ac_try="$ac_compiler $ac_option >&5"
> -case "(($ac_try" in
> -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> -  *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> -$as_echo "$ac_try_echo"; } >&5
> -  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
> -  ac_status=$?
> -  if test -s conftest.err; then
> -    sed '10a\
> -... rest of stderr output deleted ...
> -         10q' conftest.err >conftest.er1
> -    cat conftest.er1 >&5
> -  fi
> -  rm -f conftest.er1 conftest.err
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }
> -done
> +elif test "x$enable_monitors" = "xyes"; then :
> 
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +    ax_cv_monitors="y"
> 
> -int
> -main ()
> -{
> -#ifndef __GNUC__
> -       choke me
> -#endif
> +elif test -z $ax_cv_monitors; then :
> 
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_compiler_gnu=yes
> -else
> -  ac_compiler_gnu=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -ac_cv_c_compiler_gnu=$ac_compiler_gnu
> +    ax_cv_monitors="y"
> 
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
> -$as_echo "$ac_cv_c_compiler_gnu" >&6; }
> -if test $ac_compiler_gnu = yes; then
> -  GCC=yes
> -else
> -  GCC=
> -fi
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_save_c_werror_flag=$ac_c_werror_flag
> -   ac_c_werror_flag=yes
> -   ac_cv_prog_cc_g=no
> -   CFLAGS="-g"
> -   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +monitors=$ax_cv_monitors
> 
> -int
> -main ()
> -{
> 
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_prog_cc_g=yes
> -else
> -  CFLAGS=""
> -      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> 
> -int
> -main ()
> -{
> +# Check whether --enable-vtpm was given.
> +if test "${enable_vtpm+set}" = set; then :
> +  enableval=$enable_vtpm;
> +fi
> 
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> 
> -else
> -  ac_c_werror_flag=$ac_save_c_werror_flag
> -        CFLAGS="-g"
> -        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +if test "x$enable_vtpm" = "xno"; then :
> 
> -int
> -main ()
> -{
> +    ax_cv_vtpm="n"
> +
> +elif test "x$enable_vtpm" = "xyes"; then :
> +
> +    ax_cv_vtpm="y"
> +
> +elif test -z $ax_cv_vtpm; then :
> +
> +    ax_cv_vtpm="n"
> 
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_prog_cc_g=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
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -   ac_c_werror_flag=$ac_save_c_werror_flag
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
> -$as_echo "$ac_cv_prog_cc_g" >&6; }
> -if test "$ac_test_CFLAGS" = set; then
> -  CFLAGS=$ac_save_CFLAGS
> -elif test $ac_cv_prog_cc_g = yes; then
> -  if test "$GCC" = yes; then
> -    CFLAGS="-g -O2"
> -  else
> -    CFLAGS="-g"
> -  fi
> -else
> -  if test "$GCC" = yes; then
> -    CFLAGS="-O2"
> -  else
> -    CFLAGS=
> -  fi
>  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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_cv_prog_cc_c89=no
> -ac_save_CC=$CC
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <stdarg.h>
> -#include <stdio.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
> -struct buf { int x; };
> -FILE * (*rcsopen) (struct buf *, struct stat *, int);
> -static char *e (p, i)
> -     char **p;
> -     int i;
> -{
> -  return p[i];
> -}
> -static char *f (char * (*g) (char **, int), char **p, ...)
> -{
> -  char *s;
> -  va_list v;
> -  va_start (v,p);
> -  s = g (p, va_arg (v,int));
> -  va_end (v);
> -  return s;
> -}
> +vtpm=$ax_cv_vtpm
> 
> -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
> -   function prototypes and stuff, but not '\xHH' hex character constants.
> -   These don't provoke an error unfortunately, instead are silently treated
> -   as 'x'.  The following induces an error, until -std is added to get
> -   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
> -   array size at least.  It's necessary to write '\x00'==0 to get something
> -   that's true only with -std.  */
> -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
> 
> -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro 
> parameters
> -   inside strings and character constants.  */
> -#define FOO(x) 'x'
> -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
> 
> -int test (int i, double x);
> -struct s1 {int (*f) (int a);};
> -struct s2 {int (*f) (double a);};
> -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), 
> int, int);
> -int argc;
> -char **argv;
> -int
> -main ()
> -{
> -return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
> -       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
> -do
> -  CC="$ac_save_CC $ac_arg"
> -  if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_prog_cc_c89=$ac_arg
> +# Check whether --enable-xenapi was given.
> +if test "${enable_xenapi+set}" = set; then :
> +  enableval=$enable_xenapi;
>  fi
> -rm -f core conftest.err conftest.$ac_objext
> -  test "x$ac_cv_prog_cc_c89" != "xno" && break
> -done
> -rm -f conftest.$ac_ext
> -CC=$ac_save_CC
> +
> +
> +if test "x$enable_xenapi" = "xno"; then :
> +
> +    ax_cv_xenapi="n"
> +
> +elif test "x$enable_xenapi" = "xyes"; then :
> +
> +    ax_cv_xenapi="y"
> +
> +elif test -z $ax_cv_xenapi; then :
> +
> +    ax_cv_xenapi="n"
> 
>  fi
> -# AC_CACHE_VAL
> -case "x$ac_cv_prog_cc_c89" in
> -  x)
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
> -$as_echo "none needed" >&6; } ;;
> -  xno)
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
> -$as_echo "unsupported" >&6; } ;;
> -  *)
> -    CC="$CC $ac_cv_prog_cc_c89"
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
> -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
> -esac
> -if test "x$ac_cv_prog_cc_c89" != xno; then :
> +xenapi=$ax_cv_xenapi
> +
> 
> +
> +# Check whether --enable-pythontools was given.
> +if test "${enable_pythontools+set}" = set; then :
> +  enableval=$enable_pythontools;
>  fi
> 
> -ac_ext=c
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> -ac_compiler_gnu=$ac_cv_c_compiler_gnu
> 
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
> -$as_echo_n "checking whether ln -s works... " >&6; }
> -LN_S=$as_ln_s
> -if test "$LN_S" = "ln -s"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> -$as_echo "yes" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
> -$as_echo "no, using $LN_S" >&6; }
> +if test "x$enable_pythontools" = "xno"; then :
> +
> +    ax_cv_pythontools="n"
> +
> +elif test "x$enable_pythontools" = "xyes"; then :
> +
> +    ax_cv_pythontools="y"
> +
> +elif test -z $ax_cv_pythontools; then :
> +
> +    ax_cv_pythontools="y"
> +
>  fi
> +pythontools=$ax_cv_pythontools
> 
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets 
> \$(MAKE)" >&5
> -$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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat >conftest.make <<\_ACEOF
> -SHELL = /bin/sh
> -all:
> -       @echo '@@@%%%=$(MAKE)=@@@%%%'
> -_ACEOF
> -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
> -case `${MAKE-make} -f conftest.make 2>/dev/null` in
> -  *@@@%%%=?*=@@@%%%*)
> -    eval ac_cv_prog_make_${ac_make}_set=yes;;
> -  *)
> -    eval ac_cv_prog_make_${ac_make}_set=no;;
> -esac
> -rm -f conftest.make
> +
> +
> +# Check whether --enable-ocamltools was given.
> +if test "${enable_ocamltools+set}" = set; then :
> +  enableval=$enable_ocamltools;
>  fi
> -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> -$as_echo "yes" >&6; }
> -  SET_MAKE=
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -  SET_MAKE="MAKE=${MAKE-make}"
> +
> +
> +if test "x$enable_ocamltools" = "xno"; then :
> +
> +    ax_cv_ocamltools="n"
> +
> +elif test "x$enable_ocamltools" = "xyes"; then :
> +
> +    ax_cv_ocamltools="y"
> +
> +elif test -z $ax_cv_ocamltools; then :
> +
> +    ax_cv_ocamltools="y"
> +
>  fi
> +ocamltools=$ax_cv_ocamltools
> 
> -# Find a good install program.  We prefer a C program (faster),
> -# so one script is as good as another.  But avoid the broken or
> -# incompatible versions:
> -# SysV /etc/install, /usr/sbin/install
> -# SunOS /usr/etc/install
> -# IRIX /sbin/install
> -# AIX /bin/install
> -# AmigaOS /C/install, which installs bootblocks on floppy discs
> -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
> -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
> -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
> -# OS/2's system install, which has a completely different semantic
> -# ./install, which can be erroneously created by make from ./install.sh.
> -# Reject install programs that cannot install multiple files.
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> -for as_dir in $PATH
> -do
> -  IFS=$as_save_IFS
> -  test -z "$as_dir" && as_dir=.
> -    # Account for people who put trailing slashes in PATH elements.
> -case $as_dir/ in #((
> -  ./ | .// | /[cC]/* | \
> -  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
> -  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
> -  /usr/ucb/* ) ;;
> -  *)
> -    # OSF1 and SCO ODT 3.0 have their own names for install.
> -    # Don't use installbsd from OSF since it installs stuff as root
> -    # by default.
> -    for ac_prog in ginstall scoinst install; do
> -      for ac_exec_ext in '' $ac_executable_extensions; do
> -       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x 
> "$as_dir/$ac_prog$ac_exec_ext"; }; then
> -         if test $ac_prog = install &&
> -           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
> -           # AIX install.  It has an incompatible calling convention.
> -           :
> -         elif test $ac_prog = install &&
> -           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
> -           # program-specific install script used by HP pwplus--don't use.
> -           :
> -         else
> -           rm -rf conftest.one conftest.two conftest.dir
> -           echo one > conftest.one
> -           echo two > conftest.two
> -           mkdir conftest.dir
> -           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two 
> "`pwd`/conftest.dir" &&
> -             test -s conftest.one && test -s conftest.two &&
> -             test -s conftest.dir/conftest.one &&
> -             test -s conftest.dir/conftest.two
> -           then
> -             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
> -             break 3
> -           fi
> -         fi
> -       fi
> -      done
> -    done
> -    ;;
> -esac
> 
> -  done
> -IFS=$as_save_IFS
> 
> -rm -rf conftest.one conftest.two conftest.dir
> +# Check whether --enable-miniterm was given.
> +if test "${enable_miniterm+set}" = set; then :
> +  enableval=$enable_miniterm;
> +fi
> +
> +
> +if test "x$enable_miniterm" = "xno"; then :
> +
> +    ax_cv_miniterm="n"
> +
> +elif test "x$enable_miniterm" = "xyes"; then :
> +
> +    ax_cv_miniterm="y"
> +
> +elif test -z $ax_cv_miniterm; then :
> +
> +    ax_cv_miniterm="n"
> 
>  fi
> -  if test "${ac_cv_path_install+set}" = set; then
> -    INSTALL=$ac_cv_path_install
> -  else
> -    # As a last resort, use the slow shell script.  Don't cache a
> -    # value for INSTALL within a source directory, because that will
> -    # break other packages using the cache if that directory is
> -    # removed, or if the value is a relative name.
> -    INSTALL=$ac_install_sh
> -  fi
> +miniterm=$ax_cv_miniterm
> +
> +
> +
> +# Check whether --enable-lomount was given.
> +if test "${enable_lomount+set}" = set; then :
> +  enableval=$enable_lomount;
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
> -$as_echo "$INSTALL" >&6; }
> 
> -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
> -# It thinks the first close brace ends the variable substitution.
> -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
> 
> -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
> +if test "x$enable_lomount" = "xno"; then :
> 
> -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
> +    ax_cv_lomount="n"
> 
> -# Extract the first word of "bison", so it can be a program name with args.
> -set dummy bison; 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_BISON+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  case $BISON in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_BISON="$BISON" # 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_BISON="$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
> +elif test "x$enable_lomount" = "xyes"; then :
> +
> +    ax_cv_lomount="y"
> +
> +elif test -z $ax_cv_lomount; then :
> +
> +    ax_cv_lomount="n"
> 
> -  ;;
> -esac
>  fi
> -BISON=$ac_cv_path_BISON
> -if test -n "$BISON"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
> -$as_echo "$BISON" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> +lomount=$ax_cv_lomount
> +
> +
> +
> +# Check whether --enable-ovmf was given.
> +if test "${enable_ovmf+set}" = set; then :
> +  enableval=$enable_ovmf;
>  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 test "${ac_cv_path_FLEX+set}" = set; 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
> +if test "x$enable_ovmf" = "xno"; then :
> +
> +    ax_cv_ovmf="n"
> +
> +elif test "x$enable_ovmf" = "xyes"; then :
> +
> +    ax_cv_ovmf="y"
> +
> +elif test -z $ax_cv_ovmf; then :
> +
> +    ax_cv_ovmf="n"
> 
> -  ;;
> -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; }
> +ovmf=$ax_cv_ovmf
> +
> +
> +
> +# Check whether --enable-rombios was given.
> +if test "${enable_rombios+set}" = set; then :
> +  enableval=$enable_rombios;
>  fi
> 
> 
> -# Extract the first word of "perl", so it can be a program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  case $PERL in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_PERL="$PERL" # 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_PERL="$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
> +if test "x$enable_rombios" = "xno"; then :
> +
> +    ax_cv_rombios="n"
> +
> +elif test "x$enable_rombios" = "xyes"; then :
> +
> +    ax_cv_rombios="y"
> +
> +elif test -z $ax_cv_rombios; then :
> +
> +    ax_cv_rombios="y"
> 
> -  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
> -  ;;
> -esac
>  fi
> -PERL=$ac_cv_path_PERL
> -if test -n "$PERL"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
> -$as_echo "$PERL" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> +rombios=$ax_cv_rombios
> +
> +
> +
> +# Check whether --enable-seabios was given.
> +if test "${enable_seabios+set}" = set; then :
> +  enableval=$enable_seabios;
> +fi
> +
> +
> +if test "x$enable_seabios" = "xno"; then :
> +
> +    ax_cv_seabios="n"
> +
> +elif test "x$enable_seabios" = "xyes"; then :
> +
> +    ax_cv_seabios="y"
> +
> +elif test -z $ax_cv_seabios; then :
> +
> +    ax_cv_seabios="y"
> +
> +fi
> +seabios=$ax_cv_seabios
> +
> +
> +
> +# Check whether --enable-debug was given.
> +if test "${enable_debug+set}" = set; then :
> +  enableval=$enable_debug;
> +fi
> +
> +
> +if test "x$enable_debug" = "xno"; then :
> +
> +    ax_cv_debug="n"
> +
> +elif test "x$enable_debug" = "xyes"; then :
> +
> +    ax_cv_debug="y"
> +
> +elif test -z $ax_cv_debug; then :
> +
> +    ax_cv_debug="y"
> +
>  fi
> +debug=$ax_cv_debug
> +
> +
> +
> +
> +
> +
> +
> +
> +for cflag in $PREPEND_INCLUDES
> +do
> +    PREPEND_CFLAGS+=" -I$cflag"
> +done
> +for ldflag in $PREPEND_LIB
> +do
> +    PREPEND_LDFLAGS+=" -L$ldflag"
> +done
> +for cflag in $APPEND_INCLUDES
> +do
> +    APPEND_CFLAGS+=" -I$cflag"
> +done
> +for ldflag in $APPEND_LIB
> +do
> +    APPEND_LDFLAGS+=" -L$ldflag"
> +done
> +CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS"
> +LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
> +
> +
> 
> 
> -if test x"${PERL}" == x"no"
> -then
> -    as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5
> -fi
> -if test "x$xapi" = "xy"; then :
> 
> -    # Extract the first word of "curl-config", so it can be a program name 
> with args.
> -set dummy curl-config; ac_word=$2
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +# Checks for programs.
> +ac_ext=c
> +ac_cpp='$CPP $CPPFLAGS'
> +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> +ac_compiler_gnu=$ac_cv_c_compiler_gnu
> +if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program 
> name with args.
> +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_path_CURL+set}" = set; then :
> +if test "${ac_cv_prog_CC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $CURL in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_CURL="$CURL" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$CC"; then
> +  ac_cv_prog_CC="$CC" # Let the user override the test.
> +else
> +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_CURL="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_CC="${ac_tool_prefix}gcc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -5171,44 +2655,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_CURL" && ac_cv_path_CURL="no"
> -  ;;
> -esac
>  fi
> -CURL=$ac_cv_path_CURL
> -if test -n "$CURL"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5
> -$as_echo "$CURL" >&6; }
> +fi
> +CC=$ac_cv_prog_CC
> +if test -n "$CC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> +$as_echo "$CC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> -if test x"${CURL}" == x"no"
> -then
> -    as_fn_error $? "Unable to find curl-config, please install curl-config" 
> "$LINENO" 5
>  fi
> -    # Extract the first word of "xml2-config", so it can be a program name 
> with args.
> -set dummy xml2-config; ac_word=$2
> +if test -z "$ac_cv_prog_CC"; then
> +  ac_ct_CC=$CC
> +  # Extract the first word of "gcc", so it can be a program name with args.
> +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_path_XML+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $XML in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_XML="$XML" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$ac_ct_CC"; then
> +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
> +else
> +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_XML="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_ac_ct_CC="gcc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -5216,39 +2695,43 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_XML" && ac_cv_path_XML="no"
> -  ;;
> -esac
>  fi
> -XML=$ac_cv_path_XML
> -if test -n "$XML"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML" >&5
> -$as_echo "$XML" >&6; }
> +fi
> +ac_ct_CC=$ac_cv_prog_ac_ct_CC
> +if test -n "$ac_ct_CC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> +$as_echo "$ac_ct_CC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -
> -if test x"${XML}" == x"no"
> -then
> -    as_fn_error $? "Unable to find xml2-config, please install xml2-config" 
> "$LINENO" 5
> -fi
> -
> +  if test "x$ac_ct_CC" = x; then
> +    CC=""
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    CC=$ac_ct_CC
> +  fi
> +else
> +  CC="$ac_cv_prog_CC"
>  fi
> -if test "x$ocamltools" = "xy"; then :
> 
> -      # checking for ocamlc
> -  if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlc", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}ocamlc; ac_word=$2
> +if test -z "$CC"; then
> +          if test -n "$ac_tool_prefix"; then
> +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a 
> program name with args.
> +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_OCAMLC+set}" = set; then :
> +if test "${ac_cv_prog_CC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLC"; then
> -  ac_cv_prog_OCAMLC="$OCAMLC" # Let the user override the test.
> +  if test -n "$CC"; then
> +  ac_cv_prog_CC="$CC" # Let the user override the test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -5257,7 +2740,7 @@ do
>    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_prog_OCAMLC="${ac_tool_prefix}ocamlc"
> +    ac_cv_prog_CC="${ac_tool_prefix}cc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -5267,29 +2750,30 @@ IFS=$as_save_IFS
> 
>  fi
>  fi
> -OCAMLC=$ac_cv_prog_OCAMLC
> -if test -n "$OCAMLC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5
> -$as_echo "$OCAMLC" >&6; }
> +CC=$ac_cv_prog_CC
> +if test -n "$CC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> +$as_echo "$CC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> +  fi
>  fi
> -if test -z "$ac_cv_prog_OCAMLC"; then
> -  ac_ct_OCAMLC=$OCAMLC
> -  # Extract the first word of "ocamlc", so it can be a program name with 
> args.
> -set dummy ocamlc; ac_word=$2
> +if test -z "$CC"; then
> +  # Extract the first word of "cc", so it can be a program name with args.
> +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_ac_ct_OCAMLC+set}" = set; then :
> +if test "${ac_cv_prog_CC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLC"; then
> -  ac_cv_prog_ac_ct_OCAMLC="$ac_ct_OCAMLC" # Let the user override the test.
> +  if test -n "$CC"; then
> +  ac_cv_prog_CC="$CC" # Let the user override the test.
>  else
> +  ac_prog_rejected=no
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
>  do
> @@ -5297,7 +2781,11 @@ do
>    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_prog_ac_ct_OCAMLC="ocamlc"
> +    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
> +       ac_prog_rejected=yes
> +       continue
> +     fi
> +    ac_cv_prog_CC="cc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -5305,61 +2793,44 @@ done
>    done
>  IFS=$as_save_IFS
> 
> +if test $ac_prog_rejected = yes; then
> +  # We found a bogon in the path, so make sure we never use it.
> +  set dummy $ac_cv_prog_CC
> +  shift
> +  if test $# != 0; then
> +    # We chose a different compiler from the bogus one.
> +    # However, it has the same basename, so the bogon will be chosen
> +    # first if we set CC to just the basename; use the full file name.
> +    shift
> +    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
> +  fi
>  fi
>  fi
> -ac_ct_OCAMLC=$ac_cv_prog_ac_ct_OCAMLC
> -if test -n "$ac_ct_OCAMLC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLC" >&5
> -$as_echo "$ac_ct_OCAMLC" >&6; }
> +fi
> +CC=$ac_cv_prog_CC
> +if test -n "$CC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> +$as_echo "$CC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLC" = x; then
> -    OCAMLC="no"
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    OCAMLC=$ac_ct_OCAMLC
> -  fi
> -else
> -  OCAMLC="$ac_cv_prog_OCAMLC"
> -fi
> -
> -
> -  if test "$OCAMLC" != "no"; then
> -     OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p'`
> -     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCaml version is 
> $OCAMLVERSION" >&5
> -$as_echo "OCaml version is $OCAMLVERSION" >&6; }
> -     # If OCAMLLIB is set, use it
> -     if test "$OCAMLLIB" = ""; then
> -        OCAMLLIB=`$OCAMLC -where 2>/dev/null || $OCAMLC -v|tail -1|cut -d ' 
> ' -f 4`
> -     else
> -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCAMLLIB previously 
> set; preserving it." >&5
> -$as_echo "OCAMLLIB previously set; preserving it." >&6; }
> -     fi
> -     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCaml library path is 
> $OCAMLLIB" >&5
> -$as_echo "OCaml library path is $OCAMLLIB" >&6; }
> -
> -
> 
> -
> -     # checking for ocamlopt
> -     if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlopt", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}ocamlopt; ac_word=$2
> +fi
> +if test -z "$CC"; then
> +  if test -n "$ac_tool_prefix"; then
> +  for ac_prog in cl.exe
> +  do
> +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a 
> program name with args.
> +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_OCAMLOPT+set}" = set; then :
> +if test "${ac_cv_prog_CC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLOPT"; then
> -  ac_cv_prog_OCAMLOPT="$OCAMLOPT" # Let the user override the test.
> +  if test -n "$CC"; then
> +  ac_cv_prog_CC="$CC" # Let the user override the test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -5368,7 +2839,7 @@ do
>    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_prog_OCAMLOPT="${ac_tool_prefix}ocamlopt"
> +    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -5378,28 +2849,32 @@ IFS=$as_save_IFS
> 
>  fi
>  fi
> -OCAMLOPT=$ac_cv_prog_OCAMLOPT
> -if test -n "$OCAMLOPT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5
> -$as_echo "$OCAMLOPT" >&6; }
> +CC=$ac_cv_prog_CC
> +if test -n "$CC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> +$as_echo "$CC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> +    test -n "$CC" && break
> +  done
>  fi
> -if test -z "$ac_cv_prog_OCAMLOPT"; then
> -  ac_ct_OCAMLOPT=$OCAMLOPT
> -  # Extract the first word of "ocamlopt", so it can be a program name with 
> args.
> -set dummy ocamlopt; ac_word=$2
> +if test -z "$CC"; then
> +  ac_ct_CC=$CC
> +  for ac_prog in cl.exe
> +do
> +  # Extract the first word of "$ac_prog", so it can be a program name with 
> args.
> +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_OCAMLOPT+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLOPT"; then
> -  ac_cv_prog_ac_ct_OCAMLOPT="$ac_ct_OCAMLOPT" # Let the user override the 
> test.
> +  if test -n "$ac_ct_CC"; then
> +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -5408,7 +2883,7 @@ do
>    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_prog_ac_ct_OCAMLOPT="ocamlopt"
> +    ac_cv_prog_ac_ct_CC="$ac_prog"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -5416,19 +2891,23 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -fi
> -fi
> -ac_ct_OCAMLOPT=$ac_cv_prog_ac_ct_OCAMLOPT
> -if test -n "$ac_ct_OCAMLOPT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLOPT" >&5
> -$as_echo "$ac_ct_OCAMLOPT" >&6; }
> +fi
> +fi
> +ac_ct_CC=$ac_cv_prog_ac_ct_CC
> +if test -n "$ac_ct_CC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> +$as_echo "$ac_ct_CC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLOPT" = x; then
> -    OCAMLOPT="no"
> +
> +  test -n "$ac_ct_CC" && break
> +done
> +
> +  if test "x$ac_ct_CC" = x; then
> +    CC=""
>    else
>      case $cross_compiling:$ac_tool_warned in
>  yes:)
> @@ -5436,396 +2915,649 @@ yes:)
>  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
>  ac_tool_warned=yes ;;
>  esac
> -    OCAMLOPT=$ac_ct_OCAMLOPT
> +    CC=$ac_ct_CC
>    fi
> -else
> -  OCAMLOPT="$ac_cv_prog_OCAMLOPT"
>  fi
> 
> -     OCAMLBEST=byte
> -     if test "$OCAMLOPT" = "no"; then
> -       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find 
> ocamlopt; bytecode compilation only." >&5
> -$as_echo "$as_me: WARNING: Cannot find ocamlopt; bytecode compilation only." 
> >&2;}
> -     else
> -       TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
> -       if test "$TMPVERSION" != "$OCAMLVERSION" ; then
> -           { $as_echo "$as_me:${as_lineno-$LINENO}: result: versions differs 
> from ocamlc; ocamlopt discarded." >&5
> -$as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; }
> -           OCAMLOPT=no
> -       else
> -           OCAMLBEST=opt
> +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 ; }
> +
> +# Provide some information about the compiler.
> +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
> +set X $ac_compile
> +ac_compiler=$2
> +for ac_option in --version -v -V -qversion; do
> +  { { ac_try="$ac_compiler $ac_option >&5"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
> +  ac_status=$?
> +  if test -s conftest.err; then
> +    sed '10a\
> +... rest of stderr output deleted ...
> +         10q' conftest.err >conftest.er1
> +    cat conftest.er1 >&5
> +  fi
> +  rm -f conftest.er1 conftest.err
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }
> +done
> +
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +
> +int
> +main ()
> +{
> +
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +ac_clean_files_save=$ac_clean_files
> +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
> +# Try to create an executable without -o first, disregard a.out.
> +# It will help us diagnose broken compilers, and finding out an intuition
> +# of exeext.
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler 
> works" >&5
> +$as_echo_n "checking whether the C compiler works... " >&6; }
> +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
> +
> +# The possible output files:
> +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
> +
> +ac_rmfiles=
> +for ac_file in $ac_files
> +do
> +  case $ac_file in
> +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
> +    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
> +  esac
> +done
> +rm -f $ac_rmfiles
> +
> +if { { ac_try="$ac_link_default"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> +  (eval "$ac_link_default") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }; then :
> +  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
> +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
> +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
> +# so that the user can short-circuit this test for compilers unknown to
> +# Autoconf.
> +for ac_file in $ac_files ''
> +do
> +  test -f "$ac_file" || continue
> +  case $ac_file in
> +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM | *.o | *.obj )
> +       ;;
> +    [ab].out )
> +       # We found the default executable, but exeext='' is most
> +       # certainly right.
> +       break;;
> +    *.* )
> +       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
> +       then :; else
> +          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
>         fi
> -     fi
> +       # We set ac_cv_exeext here because the later test for it is not
> +       # safe: cross compilers may not add the suffix if given an `-o'
> +       # argument, so we may need to know it at that point already.
> +       # Even if this section looks crufty: it has the advantage of
> +       # actually working.
> +       break;;
> +    * )
> +       break;;
> +  esac
> +done
> +test "$ac_cv_exeext" = no && ac_cv_exeext=
> +
> +else
> +  ac_file=''
> +fi
> +if test -z "$ac_file"; then :
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +$as_echo "$as_me: failed program was:" >&5
> +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 ; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> +$as_echo "yes" >&6; }
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default 
> output file name" >&5
> +$as_echo_n "checking for C compiler default output file name... " >&6; }
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
> +$as_echo "$ac_file" >&6; }
> +ac_exeext=$ac_cv_exeext
> +
> +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
> +ac_clean_files=$ac_clean_files_save
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" 
> >&5
> +$as_echo_n "checking for suffix of executables... " >&6; }
> +if { { ac_try="$ac_link"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> +  (eval "$ac_link") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }; then :
> +  # If both `conftest.exe' and `conftest' are `present' (well, observable)
> +# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
> +# work properly (i.e., refer to `conftest.exe'), while it won't with
> +# `rm'.
> +for ac_file in conftest.exe conftest conftest.*; do
> +  test -f "$ac_file" || continue
> +  case $ac_file in
> +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
> +    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
> +         break;;
> +    * ) break;;
> +  esac
> +done
> +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 ; }
> +fi
> +rm -f conftest conftest$ac_cv_exeext
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
> +$as_echo "$ac_cv_exeext" >&6; }
> 
> +rm -f conftest.$ac_ext
> +EXEEXT=$ac_cv_exeext
> +ac_exeext=$EXEEXT
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <stdio.h>
> +int
> +main ()
> +{
> +FILE *f = fopen ("conftest.out", "w");
> + return ferror (f) || fclose (f) != 0;
> 
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +ac_clean_files="$ac_clean_files conftest.out"
> +# Check that the compiler produces executables we can run.  If not, either
> +# the compiler is broken, or we cross compile.
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross 
> compiling" >&5
> +$as_echo_n "checking whether we are cross compiling... " >&6; }
> +if test "$cross_compiling" != yes; then
> +  { { ac_try="$ac_link"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> +  (eval "$ac_link") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }
> +  if { ac_try='./conftest$ac_cv_exeext'
> +  { { case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> +  (eval "$ac_try") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }; }; then
> +    cross_compiling=no
> +  else
> +    if test "$cross_compiling" = maybe; then
> +       cross_compiling=yes
> +    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 run C compiled programs.
> +If you meant to cross compile, use \`--host'.
> +See \`config.log' for more details" "$LINENO" 5 ; }
> +    fi
> +  fi
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
> +$as_echo "$cross_compiling" >&6; }
> 
> -     # checking for ocamlc.opt
> -     if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlc.opt", so it can be a 
> program name with args.
> -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 :
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLCDOTOPT"; then
> -  ac_cv_prog_OCAMLCDOTOPT="$OCAMLCDOTOPT" # Let the user override the test.
> -else
> -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_prog_OCAMLCDOTOPT="${ac_tool_prefix}ocamlc.opt"
> -    $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
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> 
> -fi
> -fi
> -OCAMLCDOTOPT=$ac_cv_prog_OCAMLCDOTOPT
> -if test -n "$OCAMLCDOTOPT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLCDOTOPT" >&5
> -$as_echo "$OCAMLCDOTOPT" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> +int
> +main ()
> +{
> 
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +rm -f conftest.o conftest.obj
> +if { { ac_try="$ac_compile"
> +case "(($ac_try" in
> +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +  *) ac_try_echo=$ac_try;;
> +esac
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> +  (eval "$ac_compile") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }; then :
> +  for ac_file in conftest.o conftest.obj conftest.*; do
> +  test -f "$ac_file" || continue;
> +  case $ac_file in
> +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | 
> *.map | *.inf | *.dSYM ) ;;
> +    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
> +       break;;
> +  esac
> +done
> +else
> +  $as_echo "$as_me: failed program was:" >&5
> +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 ; }
>  fi
> -if test -z "$ac_cv_prog_OCAMLCDOTOPT"; then
> -  ac_ct_OCAMLCDOTOPT=$OCAMLCDOTOPT
> -  # Extract the first word of "ocamlc.opt", so it can be a program name with 
> args.
> -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 :
> +rm -f conftest.$ac_cv_objext conftest.$ac_ext
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
> +$as_echo "$ac_cv_objext" >&6; }
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLCDOTOPT"; then
> -  ac_cv_prog_ac_ct_OCAMLCDOTOPT="$ac_ct_OCAMLCDOTOPT" # Let the user 
> override the test.
> -else
> -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_prog_ac_ct_OCAMLCDOTOPT="ocamlc.opt"
> -    $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
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> 
> -fi
> -fi
> -ac_ct_OCAMLCDOTOPT=$ac_cv_prog_ac_ct_OCAMLCDOTOPT
> -if test -n "$ac_ct_OCAMLCDOTOPT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLCDOTOPT" >&5
> -$as_echo "$ac_ct_OCAMLCDOTOPT" >&6; }
> +int
> +main ()
> +{
> +#ifndef __GNUC__
> +       choke me
> +#endif
> +
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +  ac_compiler_gnu=yes
>  else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> +  ac_compiler_gnu=no
>  fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +ac_cv_c_compiler_gnu=$ac_compiler_gnu
> 
> -  if test "x$ac_ct_OCAMLCDOTOPT" = x; then
> -    OCAMLCDOTOPT="no"
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    OCAMLCDOTOPT=$ac_ct_OCAMLCDOTOPT
> -  fi
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
> +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
> +if test $ac_compiler_gnu = yes; then
> +  GCC=yes
>  else
> -  OCAMLCDOTOPT="$ac_cv_prog_OCAMLCDOTOPT"
> +  GCC=
>  fi
> -
> -     if test "$OCAMLCDOTOPT" != "no"; then
> -       TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' 
> `
> -       if test "$TMPVERSION" != "$OCAMLVERSION" ; then
> -           { $as_echo "$as_me:${as_lineno-$LINENO}: result: versions differs 
> from ocamlc; ocamlc.opt discarded." >&5
> -$as_echo "versions differs from ocamlc; ocamlc.opt discarded." >&6; }
> -       else
> -           OCAMLC=$OCAMLCDOTOPT
> -       fi
> -     fi
> -
> -     # checking for ocamlopt.opt
> -     if test "$OCAMLOPT" != "no" ; then
> -       if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlopt.opt", so it can be 
> a program name with args.
> -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 :
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLOPTDOTOPT"; then
> -  ac_cv_prog_OCAMLOPTDOTOPT="$OCAMLOPTDOTOPT" # Let the user override the 
> test.
> -else
> -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_prog_OCAMLOPTDOTOPT="${ac_tool_prefix}ocamlopt.opt"
> -    $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
> +  ac_save_c_werror_flag=$ac_c_werror_flag
> +   ac_c_werror_flag=yes
> +   ac_cv_prog_cc_g=no
> +   CFLAGS="-g"
> +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> 
> -fi
> -fi
> -OCAMLOPTDOTOPT=$ac_cv_prog_OCAMLOPTDOTOPT
> -if test -n "$OCAMLOPTDOTOPT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPTDOTOPT" >&5
> -$as_echo "$OCAMLOPTDOTOPT" >&6; }
> +int
> +main ()
> +{
> +
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +  ac_cv_prog_cc_g=yes
>  else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> +  CFLAGS=""
> +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> 
> +int
> +main ()
> +{
> 
> -fi
> -if test -z "$ac_cv_prog_OCAMLOPTDOTOPT"; then
> -  ac_ct_OCAMLOPTDOTOPT=$OCAMLOPTDOTOPT
> -  # Extract the first word of "ocamlopt.opt", so it can be a program name 
> with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
> -  ac_cv_prog_ac_ct_OCAMLOPTDOTOPT="$ac_ct_OCAMLOPTDOTOPT" # Let the user 
> override the test.
> -else
> -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_prog_ac_ct_OCAMLOPTDOTOPT="ocamlopt.opt"
> -    $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
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +
> +else
> +  ac_c_werror_flag=$ac_save_c_werror_flag
> +        CFLAGS="-g"
> +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +
> +int
> +main ()
> +{
> 
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +  ac_cv_prog_cc_g=yes
>  fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>  fi
> -ac_ct_OCAMLOPTDOTOPT=$ac_cv_prog_ac_ct_OCAMLOPTDOTOPT
> -if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLOPTDOTOPT" >&5
> -$as_echo "$ac_ct_OCAMLOPTDOTOPT" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>  fi
> -
> -  if test "x$ac_ct_OCAMLOPTDOTOPT" = x; then
> -    OCAMLOPTDOTOPT="no"
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +   ac_c_werror_flag=$ac_save_c_werror_flag
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
> +$as_echo "$ac_cv_prog_cc_g" >&6; }
> +if test "$ac_test_CFLAGS" = set; then
> +  CFLAGS=$ac_save_CFLAGS
> +elif test $ac_cv_prog_cc_g = yes; then
> +  if test "$GCC" = yes; then
> +    CFLAGS="-g -O2"
>    else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    OCAMLOPTDOTOPT=$ac_ct_OCAMLOPTDOTOPT
> +    CFLAGS="-g"
>    fi
>  else
> -  OCAMLOPTDOTOPT="$ac_cv_prog_OCAMLOPTDOTOPT"
> -fi
> -
> -       if test "$OCAMLOPTDOTOPT" != "no"; then
> -          TMPVERSION=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* 
> *\(.*\)$|\1|p' `
> -          if test "$TMPVERSION" != "$OCAMLVERSION" ; then
> -             { $as_echo "$as_me:${as_lineno-$LINENO}: result: version 
> differs from ocamlc; ocamlopt.opt discarded." >&5
> -$as_echo "version differs from ocamlc; ocamlopt.opt discarded." >&6; }
> -          else
> -             OCAMLOPT=$OCAMLOPTDOTOPT
> -          fi
> -        fi
> -     fi
> -
> -
> +  if test "$GCC" = yes; then
> +    CFLAGS="-O2"
> +  else
> +    CFLAGS=
>    fi
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  ac_cv_prog_cc_c89=no
> +ac_save_CC=$CC
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <stdarg.h>
> +#include <stdio.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
> +struct buf { int x; };
> +FILE * (*rcsopen) (struct buf *, struct stat *, int);
> +static char *e (p, i)
> +     char **p;
> +     int i;
> +{
> +  return p[i];
> +}
> +static char *f (char * (*g) (char **, int), char **p, ...)
> +{
> +  char *s;
> +  va_list v;
> +  va_start (v,p);
> +  s = g (p, va_arg (v,int));
> +  va_end (v);
> +  return s;
> +}
> 
> +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
> +   function prototypes and stuff, but not '\xHH' hex character constants.
> +   These don't provoke an error unfortunately, instead are silently treated
> +   as 'x'.  The following induces an error, until -std is added to get
> +   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
> +   array size at least.  It's necessary to write '\x00'==0 to get something
> +   that's true only with -std.  */
> +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
> 
> +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro 
> parameters
> +   inside strings and character constants.  */
> +#define FOO(x) 'x'
> +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
> 
> -  # checking for ocaml toplevel
> -  if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocaml", so it can be a 
> program name with args.
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test -n "$OCAML"; then
> -  ac_cv_prog_OCAML="$OCAML" # Let the user override the test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> -for as_dir in $PATH
> +int test (int i, double x);
> +struct s1 {int (*f) (int a);};
> +struct s2 {int (*f) (double a);};
> +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), 
> int, int);
> +int argc;
> +char **argv;
> +int
> +main ()
> +{
> +return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
> +  ;
> +  return 0;
> +}
> +_ACEOF
> +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
> +       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
>  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_prog_OCAML="${ac_tool_prefix}ocaml"
> -    $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
> -    break 2
> -  fi
> +  CC="$ac_save_CC $ac_arg"
> +  if ac_fn_c_try_compile "$LINENO"; then :
> +  ac_cv_prog_cc_c89=$ac_arg
> +fi
> +rm -f core conftest.err conftest.$ac_objext
> +  test "x$ac_cv_prog_cc_c89" != "xno" && break
>  done
> -  done
> -IFS=$as_save_IFS
> +rm -f conftest.$ac_ext
> +CC=$ac_save_CC
> 
>  fi
> -fi
> -OCAML=$ac_cv_prog_OCAML
> -if test -n "$OCAML"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAML" >&5
> -$as_echo "$OCAML" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> +# AC_CACHE_VAL
> +case "x$ac_cv_prog_cc_c89" in
> +  x)
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
> +$as_echo "none needed" >&6; } ;;
> +  xno)
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
> +$as_echo "unsupported" >&6; } ;;
> +  *)
> +    CC="$CC $ac_cv_prog_cc_c89"
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
> +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
> +esac
> +if test "x$ac_cv_prog_cc_c89" != xno; then :
> +
>  fi
> 
> +ac_ext=c
> +ac_cpp='$CPP $CPPFLAGS'
> +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> +ac_compiler_gnu=$ac_cv_c_compiler_gnu
> 
> -fi
> -if test -z "$ac_cv_prog_OCAML"; then
> -  ac_ct_OCAML=$OCAML
> -  # Extract the first word of "ocaml", so it can be a program name with args.
> -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 :
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets 
> \$(MAKE)" >&5
> +$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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAML"; then
> -  ac_cv_prog_ac_ct_OCAML="$ac_ct_OCAML" # Let the user override the test.
> -else
> -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_prog_ac_ct_OCAML="ocaml"
> -    $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
> -
> -fi
> -fi
> -ac_ct_OCAML=$ac_cv_prog_ac_ct_OCAML
> -if test -n "$ac_ct_OCAML"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAML" >&5
> -$as_echo "$ac_ct_OCAML" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -  if test "x$ac_ct_OCAML" = x; then
> -    OCAML="no"
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> +  cat >conftest.make <<\_ACEOF
> +SHELL = /bin/sh
> +all:
> +       @echo '@@@%%%=$(MAKE)=@@@%%%'
> +_ACEOF
> +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
> +case `${MAKE-make} -f conftest.make 2>/dev/null` in
> +  *@@@%%%=?*=@@@%%%*)
> +    eval ac_cv_prog_make_${ac_make}_set=yes;;
> +  *)
> +    eval ac_cv_prog_make_${ac_make}_set=no;;
>  esac
> -    OCAML=$ac_ct_OCAML
> -  fi
> +rm -f conftest.make
> +fi
> +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> +$as_echo "yes" >&6; }
> +  SET_MAKE=
>  else
> -  OCAML="$ac_cv_prog_OCAML"
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +  SET_MAKE="MAKE=${MAKE-make}"
>  fi
> 
> -
> -  # checking for ocamldep
> -  if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamldep", so it can be a 
> program name with args.
> -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 :
> +# Find a good install program.  We prefer a C program (faster),
> +# so one script is as good as another.  But avoid the broken or
> +# incompatible versions:
> +# SysV /etc/install, /usr/sbin/install
> +# SunOS /usr/etc/install
> +# IRIX /sbin/install
> +# AIX /bin/install
> +# AmigaOS /C/install, which installs bootblocks on floppy discs
> +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
> +# AFS /usr/afsws/bin/install, which mishandles nonexistent args
> +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
> +# OS/2's system install, which has a completely different semantic
> +# ./install, which can be erroneously created by make from ./install.sh.
> +# Reject install programs that cannot install multiple files.
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLDEP"; then
> -  ac_cv_prog_OCAMLDEP="$OCAMLDEP" # Let the user override the test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  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_prog_OCAMLDEP="${ac_tool_prefix}ocamldep"
> -    $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
> -    break 2
> -  fi
> -done
> +    # Account for people who put trailing slashes in PATH elements.
> +case $as_dir/ in #((
> +  ./ | .// | /[cC]/* | \
> +  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
> +  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
> +  /usr/ucb/* ) ;;
> +  *)
> +    # OSF1 and SCO ODT 3.0 have their own names for install.
> +    # Don't use installbsd from OSF since it installs stuff as root
> +    # by default.
> +    for ac_prog in ginstall scoinst install; do
> +      for ac_exec_ext in '' $ac_executable_extensions; do
> +       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x 
> "$as_dir/$ac_prog$ac_exec_ext"; }; then
> +         if test $ac_prog = install &&
> +           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
> +           # AIX install.  It has an incompatible calling convention.
> +           :
> +         elif test $ac_prog = install &&
> +           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
> +           # program-specific install script used by HP pwplus--don't use.
> +           :
> +         else
> +           rm -rf conftest.one conftest.two conftest.dir
> +           echo one > conftest.one
> +           echo two > conftest.two
> +           mkdir conftest.dir
> +           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two 
> "`pwd`/conftest.dir" &&
> +             test -s conftest.one && test -s conftest.two &&
> +             test -s conftest.dir/conftest.one &&
> +             test -s conftest.dir/conftest.two
> +           then
> +             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
> +             break 3
> +           fi
> +         fi
> +       fi
> +      done
> +    done
> +    ;;
> +esac
> +
>    done
>  IFS=$as_save_IFS
> 
> +rm -rf conftest.one conftest.two conftest.dir
> +
>  fi
> +  if test "${ac_cv_path_install+set}" = set; then
> +    INSTALL=$ac_cv_path_install
> +  else
> +    # As a last resort, use the slow shell script.  Don't cache a
> +    # value for INSTALL within a source directory, because that will
> +    # break other packages using the cache if that directory is
> +    # removed, or if the value is a relative name.
> +    INSTALL=$ac_install_sh
> +  fi
>  fi
> -OCAMLDEP=$ac_cv_prog_OCAMLDEP
> -if test -n "$OCAMLDEP"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5
> -$as_echo "$OCAMLDEP" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
> +$as_echo "$INSTALL" >&6; }
> 
> +# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
> +# It thinks the first close brace ends the variable substitution.
> +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
> 
> -fi
> -if test -z "$ac_cv_prog_OCAMLDEP"; then
> -  ac_ct_OCAMLDEP=$OCAMLDEP
> -  # Extract the first word of "ocamldep", so it can be a program name with 
> args.
> -set dummy ocamldep; ac_word=$2
> +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
> +
> +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
> +
> +# Extract the first word of "bison", so it can be a program name with args.
> +set dummy bison; 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 test "${ac_cv_path_BISON+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLDEP"; then
> -  ac_cv_prog_ac_ct_OCAMLDEP="$ac_ct_OCAMLDEP" # Let the user override the 
> test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  case $BISON in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_BISON="$BISON" # 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_prog_ac_ct_OCAMLDEP="ocamldep"
> +    ac_cv_path_BISON="$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
> @@ -5833,53 +3565,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> +  ;;
> +esac
>  fi
> -fi
> -ac_ct_OCAMLDEP=$ac_cv_prog_ac_ct_OCAMLDEP
> -if test -n "$ac_ct_OCAMLDEP"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDEP" >&5
> -$as_echo "$ac_ct_OCAMLDEP" >&6; }
> +BISON=$ac_cv_path_BISON
> +if test -n "$BISON"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
> +$as_echo "$BISON" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLDEP" = x; then
> -    OCAMLDEP="no"
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    OCAMLDEP=$ac_ct_OCAMLDEP
> -  fi
> -else
> -  OCAMLDEP="$ac_cv_prog_OCAMLDEP"
> -fi
> -
> 
> -  # checking for ocamlmktop
> -  if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlmktop", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}ocamlmktop; ac_word=$2
> +# 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 test "${ac_cv_prog_OCAMLMKTOP+set}" = set; then :
> +if test "${ac_cv_path_FLEX+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLMKTOP"; then
> -  ac_cv_prog_OCAMLMKTOP="$OCAMLMKTOP" # Let the user override the test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  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_prog_OCAMLMKTOP="${ac_tool_prefix}ocamlmktop"
> +    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
> @@ -5887,39 +3605,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> +  ;;
> +esac
>  fi
> -fi
> -OCAMLMKTOP=$ac_cv_prog_OCAMLMKTOP
> -if test -n "$OCAMLMKTOP"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLMKTOP" >&5
> -$as_echo "$OCAMLMKTOP" >&6; }
> +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
> 
> 
> -fi
> -if test -z "$ac_cv_prog_OCAMLMKTOP"; then
> -  ac_ct_OCAMLMKTOP=$OCAMLMKTOP
> -  # Extract the first word of "ocamlmktop", so it can be a program name with 
> args.
> -set dummy ocamlmktop; ac_word=$2
> +# Extract the first word of "perl", so it can be a program name with args.
> +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_prog_ac_ct_OCAMLMKTOP+set}" = set; then :
> +if test "${ac_cv_path_PERL+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLMKTOP"; then
> -  ac_cv_prog_ac_ct_OCAMLMKTOP="$ac_ct_OCAMLMKTOP" # Let the user override 
> the test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  case $PERL in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_PERL="$PERL" # 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_prog_ac_ct_OCAMLMKTOP="ocamlmktop"
> +    ac_cv_path_PERL="$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
> @@ -5927,53 +3645,46 @@ done
>    done
>  IFS=$as_save_IFS
> 
> +  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
> +  ;;
> +esac
>  fi
> -fi
> -ac_ct_OCAMLMKTOP=$ac_cv_prog_ac_ct_OCAMLMKTOP
> -if test -n "$ac_ct_OCAMLMKTOP"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLMKTOP" >&5
> -$as_echo "$ac_ct_OCAMLMKTOP" >&6; }
> +PERL=$ac_cv_path_PERL
> +if test -n "$PERL"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
> +$as_echo "$PERL" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLMKTOP" = x; then
> -    OCAMLMKTOP="no"
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    OCAMLMKTOP=$ac_ct_OCAMLMKTOP
> -  fi
> -else
> -  OCAMLMKTOP="$ac_cv_prog_OCAMLMKTOP"
> -fi
> 
> +if test x"${PERL}" == x"no"
> +then
> +    as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5
> +fi
> +if test "x$xapi" = "xy"; then :
> 
> -  # checking for ocamlmklib
> -  if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlmklib", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}ocamlmklib; ac_word=$2
> +    # Extract the first word of "curl-config", so it can be a program name 
> with args.
> +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_prog_OCAMLMKLIB+set}" = set; then :
> +if test "${ac_cv_path_CURL+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLMKLIB"; then
> -  ac_cv_prog_OCAMLMKLIB="$OCAMLMKLIB" # Let the user override the test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  case $CURL in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_CURL="$CURL" # 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_prog_OCAMLMKLIB="${ac_tool_prefix}ocamlmklib"
> +    ac_cv_path_CURL="$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
> @@ -5981,39 +3692,44 @@ done
>    done
>  IFS=$as_save_IFS
> 
> +  test -z "$ac_cv_path_CURL" && ac_cv_path_CURL="no"
> +  ;;
> +esac
>  fi
> -fi
> -OCAMLMKLIB=$ac_cv_prog_OCAMLMKLIB
> -if test -n "$OCAMLMKLIB"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLMKLIB" >&5
> -$as_echo "$OCAMLMKLIB" >&6; }
> +CURL=$ac_cv_path_CURL
> +if test -n "$CURL"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5
> +$as_echo "$CURL" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> +if test x"${CURL}" == x"no"
> +then
> +    as_fn_error $? "Unable to find curl-config, please install curl-config" 
> "$LINENO" 5
>  fi
> -if test -z "$ac_cv_prog_OCAMLMKLIB"; then
> -  ac_ct_OCAMLMKLIB=$OCAMLMKLIB
> -  # Extract the first word of "ocamlmklib", so it can be a program name with 
> args.
> -set dummy ocamlmklib; ac_word=$2
> +    # Extract the first word of "xml2-config", so it can be a program name 
> with args.
> +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_prog_ac_ct_OCAMLMKLIB+set}" = set; then :
> +if test "${ac_cv_path_XML+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLMKLIB"; then
> -  ac_cv_prog_ac_ct_OCAMLMKLIB="$ac_ct_OCAMLMKLIB" # Let the user override 
> the test.
> -else
> -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  case $XML in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_XML="$XML" # 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_prog_ac_ct_OCAMLMKLIB="ocamlmklib"
> +    ac_cv_path_XML="$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
> @@ -6021,44 +3737,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> +  test -z "$ac_cv_path_XML" && ac_cv_path_XML="no"
> +  ;;
> +esac
>  fi
> -fi
> -ac_ct_OCAMLMKLIB=$ac_cv_prog_ac_ct_OCAMLMKLIB
> -if test -n "$ac_ct_OCAMLMKLIB"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLMKLIB" >&5
> -$as_echo "$ac_ct_OCAMLMKLIB" >&6; }
> +XML=$ac_cv_path_XML
> +if test -n "$XML"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML" >&5
> +$as_echo "$XML" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLMKLIB" = x; then
> -    OCAMLMKLIB="no"
> -  else
> -    case $cross_compiling:$ac_tool_warned in
> -yes:)
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> -ac_tool_warned=yes ;;
> -esac
> -    OCAMLMKLIB=$ac_ct_OCAMLMKLIB
> -  fi
> -else
> -  OCAMLMKLIB="$ac_cv_prog_OCAMLMKLIB"
> +
> +if test x"${XML}" == x"no"
> +then
> +    as_fn_error $? "Unable to find xml2-config, please install xml2-config" 
> "$LINENO" 5
>  fi
> 
> +fi
> +if test "x$ocamltools" = "xy"; then :
> 
> -  # checking for ocamldoc
> +      # checking for ocamlc
>    if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamldoc", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}ocamldoc; ac_word=$2
> +  # Extract the first word of "${ac_tool_prefix}ocamlc", so it can be a 
> program name with args.
> +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_OCAMLDOC+set}" = set; then :
> +if test "${ac_cv_prog_OCAMLC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLDOC"; then
> -  ac_cv_prog_OCAMLDOC="$OCAMLDOC" # Let the user override the test.
> +  if test -n "$OCAMLC"; then
> +  ac_cv_prog_OCAMLC="$OCAMLC" # Let the user override the test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -6067,7 +3778,7 @@ do
>    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_prog_OCAMLDOC="${ac_tool_prefix}ocamldoc"
> +    ac_cv_prog_OCAMLC="${ac_tool_prefix}ocamlc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6077,10 +3788,10 @@ IFS=$as_save_IFS
> 
>  fi
>  fi
> -OCAMLDOC=$ac_cv_prog_OCAMLDOC
> -if test -n "$OCAMLDOC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDOC" >&5
> -$as_echo "$OCAMLDOC" >&6; }
> +OCAMLC=$ac_cv_prog_OCAMLC
> +if test -n "$OCAMLC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLC" >&5
> +$as_echo "$OCAMLC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
> @@ -6088,17 +3799,17 @@ fi
> 
> 
>  fi
> -if test -z "$ac_cv_prog_OCAMLDOC"; then
> -  ac_ct_OCAMLDOC=$OCAMLDOC
> -  # Extract the first word of "ocamldoc", so it can be a program name with 
> args.
> -set dummy ocamldoc; ac_word=$2
> +if test -z "$ac_cv_prog_OCAMLC"; then
> +  ac_ct_OCAMLC=$OCAMLC
> +  # Extract the first word of "ocamlc", so it can be a program name with 
> args.
> +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_OCAMLDOC+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAMLC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLDOC"; then
> -  ac_cv_prog_ac_ct_OCAMLDOC="$ac_ct_OCAMLDOC" # Let the user override the 
> test.
> +  if test -n "$ac_ct_OCAMLC"; then
> +  ac_cv_prog_ac_ct_OCAMLC="$ac_ct_OCAMLC" # Let the user override the test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -6107,7 +3818,7 @@ do
>    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_prog_ac_ct_OCAMLDOC="ocamldoc"
> +    ac_cv_prog_ac_ct_OCAMLC="ocamlc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6117,17 +3828,17 @@ IFS=$as_save_IFS
> 
>  fi
>  fi
> -ac_ct_OCAMLDOC=$ac_cv_prog_ac_ct_OCAMLDOC
> -if test -n "$ac_ct_OCAMLDOC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDOC" >&5
> -$as_echo "$ac_ct_OCAMLDOC" >&6; }
> +ac_ct_OCAMLC=$ac_cv_prog_ac_ct_OCAMLC
> +if test -n "$ac_ct_OCAMLC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLC" >&5
> +$as_echo "$ac_ct_OCAMLC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLDOC" = x; then
> -    OCAMLDOC="no"
> +  if test "x$ac_ct_OCAMLC" = x; then
> +    OCAMLC="no"
>    else
>      case $cross_compiling:$ac_tool_warned in
>  yes:)
> @@ -6135,24 +3846,41 @@ yes:)
>  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
>  ac_tool_warned=yes ;;
>  esac
> -    OCAMLDOC=$ac_ct_OCAMLDOC
> +    OCAMLC=$ac_ct_OCAMLC
>    fi
>  else
> -  OCAMLDOC="$ac_cv_prog_OCAMLDOC"
> +  OCAMLC="$ac_cv_prog_OCAMLC"
>  fi
> 
> 
> -  # checking for ocamlbuild
> -  if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}ocamlbuild", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}ocamlbuild; ac_word=$2
> +  if test "$OCAMLC" != "no"; then
> +     OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p'`
> +     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCaml version is 
> $OCAMLVERSION" >&5
> +$as_echo "OCaml version is $OCAMLVERSION" >&6; }
> +     # If OCAMLLIB is set, use it
> +     if test "$OCAMLLIB" = ""; then
> +        OCAMLLIB=`$OCAMLC -where 2>/dev/null || $OCAMLC -v|tail -1|cut -d ' 
> ' -f 4`
> +     else
> +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCAMLLIB previously 
> set; preserving it." >&5
> +$as_echo "OCAMLLIB previously set; preserving it." >&6; }
> +     fi
> +     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OCaml library path is 
> $OCAMLLIB" >&5
> +$as_echo "OCaml library path is $OCAMLLIB" >&6; }
> +
> +
> +
> +
> +     # checking for ocamlopt
> +     if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamlopt", so it can be a 
> program name with args.
> +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_OCAMLBUILD+set}" = set; then :
> +if test "${ac_cv_prog_OCAMLOPT+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$OCAMLBUILD"; then
> -  ac_cv_prog_OCAMLBUILD="$OCAMLBUILD" # Let the user override the test.
> +  if test -n "$OCAMLOPT"; then
> +  ac_cv_prog_OCAMLOPT="$OCAMLOPT" # Let the user override the test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -6161,7 +3889,7 @@ do
>    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_prog_OCAMLBUILD="${ac_tool_prefix}ocamlbuild"
> +    ac_cv_prog_OCAMLOPT="${ac_tool_prefix}ocamlopt"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6171,10 +3899,10 @@ IFS=$as_save_IFS
> 
>  fi
>  fi
> -OCAMLBUILD=$ac_cv_prog_OCAMLBUILD
> -if test -n "$OCAMLBUILD"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLBUILD" >&5
> -$as_echo "$OCAMLBUILD" >&6; }
> +OCAMLOPT=$ac_cv_prog_OCAMLOPT
> +if test -n "$OCAMLOPT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPT" >&5
> +$as_echo "$OCAMLOPT" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
> @@ -6182,17 +3910,17 @@ fi
> 
> 
>  fi
> -if test -z "$ac_cv_prog_OCAMLBUILD"; then
> -  ac_ct_OCAMLBUILD=$OCAMLBUILD
> -  # Extract the first word of "ocamlbuild", so it can be a program name with 
> args.
> -set dummy ocamlbuild; ac_word=$2
> +if test -z "$ac_cv_prog_OCAMLOPT"; then
> +  ac_ct_OCAMLOPT=$OCAMLOPT
> +  # Extract the first word of "ocamlopt", so it can be a program name with 
> args.
> +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_OCAMLBUILD+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAMLOPT+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test -n "$ac_ct_OCAMLBUILD"; then
> -  ac_cv_prog_ac_ct_OCAMLBUILD="$ac_ct_OCAMLBUILD" # Let the user override 
> the test.
> +  if test -n "$ac_ct_OCAMLOPT"; then
> +  ac_cv_prog_ac_ct_OCAMLOPT="$ac_ct_OCAMLOPT" # Let the user override the 
> test.
>  else
>  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>  for as_dir in $PATH
> @@ -6201,7 +3929,7 @@ do
>    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_prog_ac_ct_OCAMLBUILD="ocamlbuild"
> +    ac_cv_prog_ac_ct_OCAMLOPT="ocamlopt"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6211,17 +3939,17 @@ IFS=$as_save_IFS
> 
>  fi
>  fi
> -ac_ct_OCAMLBUILD=$ac_cv_prog_ac_ct_OCAMLBUILD
> -if test -n "$ac_ct_OCAMLBUILD"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLBUILD" >&5
> -$as_echo "$ac_ct_OCAMLBUILD" >&6; }
> +ac_ct_OCAMLOPT=$ac_cv_prog_ac_ct_OCAMLOPT
> +if test -n "$ac_ct_OCAMLOPT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLOPT" >&5
> +$as_echo "$ac_ct_OCAMLOPT" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_ct_OCAMLBUILD" = x; then
> -    OCAMLBUILD="no"
> +  if test "x$ac_ct_OCAMLOPT" = x; then
> +    OCAMLOPT="no"
>    else
>      case $cross_compiling:$ac_tool_warned in
>  yes:)
> @@ -6229,44 +3957,89 @@ yes:)
>  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
>  ac_tool_warned=yes ;;
>  esac
> -    OCAMLBUILD=$ac_ct_OCAMLBUILD
> +    OCAMLOPT=$ac_ct_OCAMLOPT
>    fi
>  else
> -  OCAMLBUILD="$ac_cv_prog_OCAMLBUILD"
> +  OCAMLOPT="$ac_cv_prog_OCAMLOPT"
>  fi
> 
> +     OCAMLBEST=byte
> +     if test "$OCAMLOPT" = "no"; then
> +       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find 
> ocamlopt; bytecode compilation only." >&5
> +$as_echo "$as_me: WARNING: Cannot find ocamlopt; bytecode compilation only." 
> >&2;}
> +     else
> +       TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
> +       if test "$TMPVERSION" != "$OCAMLVERSION" ; then
> +           { $as_echo "$as_me:${as_lineno-$LINENO}: result: versions differs 
> from ocamlc; ocamlopt discarded." >&5
> +$as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; }
> +           OCAMLOPT=no
> +       else
> +           OCAMLBEST=opt
> +       fi
> +     fi
> 
> -    if test "x$OCAMLC" = "xno"; then :
> 
> -        if test "x$enable_ocamltools" = "xyes"; then :
> 
> -            as_fn_error $? "Ocaml tools enabled, but unable to find Ocaml" 
> "$LINENO" 5
> -fi
> -        ocamltools="n"
> +     # checking for ocamlc.opt
> +     if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamlc.opt", so it can be a 
> program name with args.
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  if test -n "$OCAMLCDOTOPT"; then
> +  ac_cv_prog_OCAMLCDOTOPT="$OCAMLCDOTOPT" # Let the user override the test.
> +else
> +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_prog_OCAMLCDOTOPT="${ac_tool_prefix}ocamlc.opt"
> +    $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
> 
>  fi
> +fi
> +OCAMLCDOTOPT=$ac_cv_prog_OCAMLCDOTOPT
> +if test -n "$OCAMLCDOTOPT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLCDOTOPT" >&5
> +$as_echo "$OCAMLCDOTOPT" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +fi
> +
> 
>  fi
> -# Extract the first word of "bash", so it can be a program name with args.
> -set dummy bash; ac_word=$2
> +if test -z "$ac_cv_prog_OCAMLCDOTOPT"; then
> +  ac_ct_OCAMLCDOTOPT=$OCAMLCDOTOPT
> +  # Extract the first word of "ocamlc.opt", so it can be a program name with 
> args.
> +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_path_BASH+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAMLCDOTOPT+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $BASH in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$ac_ct_OCAMLCDOTOPT"; then
> +  ac_cv_prog_ac_ct_OCAMLCDOTOPT="$ac_ct_OCAMLCDOTOPT" # Let the user 
> override the test.
> +else
> +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_BASH="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_ac_ct_OCAMLCDOTOPT="ocamlc.opt"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6274,56 +4047,63 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_BASH" && ac_cv_path_BASH="no"
> -  ;;
> -esac
>  fi
> -BASH=$ac_cv_path_BASH
> -if test -n "$BASH"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
> -$as_echo "$BASH" >&6; }
> +fi
> +ac_ct_OCAMLCDOTOPT=$ac_cv_prog_ac_ct_OCAMLCDOTOPT
> +if test -n "$ac_ct_OCAMLCDOTOPT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLCDOTOPT" >&5
> +$as_echo "$ac_ct_OCAMLCDOTOPT" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -
> -if test x"${BASH}" == x"no"
> -then
> -    as_fn_error $? "Unable to find bash, please install bash" "$LINENO" 5
> +  if test "x$ac_ct_OCAMLCDOTOPT" = x; then
> +    OCAMLCDOTOPT="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAMLCDOTOPT=$ac_ct_OCAMLCDOTOPT
> +  fi
> +else
> +  OCAMLCDOTOPT="$ac_cv_prog_OCAMLCDOTOPT"
>  fi
> -if test "x$pythontools" = "xy"; then :
> -
> -    if echo "$PYTHON" | grep -q "^/"; then :
> 
> -        PYTHONPATH=$PYTHON
> -        PYTHON=`basename $PYTHONPATH`
> +     if test "$OCAMLCDOTOPT" != "no"; then
> +       TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' 
> `
> +       if test "$TMPVERSION" != "$OCAMLVERSION" ; then
> +           { $as_echo "$as_me:${as_lineno-$LINENO}: result: versions differs 
> from ocamlc; ocamlc.opt discarded." >&5
> +$as_echo "versions differs from ocamlc; ocamlc.opt discarded." >&6; }
> +       else
> +           OCAMLC=$OCAMLCDOTOPT
> +       fi
> +     fi
> 
> -elif test -z "$PYTHON"; then :
> -  PYTHON="python"
> -else
> -  as_fn_error $? "PYTHON specified, but is not an absolute path" "$LINENO" 5
> -fi
> -    # Extract the first word of "$PYTHON", so it can be a program name with 
> args.
> -set dummy $PYTHON; ac_word=$2
> +     # checking for ocamlopt.opt
> +     if test "$OCAMLOPT" != "no" ; then
> +       if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamlopt.opt", so it can be 
> a program name with args.
> +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_path_PYTHONPATH+set}" = set; then :
> +if test "${ac_cv_prog_OCAMLOPTDOTOPT+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $PYTHONPATH in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_PYTHONPATH="$PYTHONPATH" # Let the user override the test with 
> a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$OCAMLOPTDOTOPT"; then
> +  ac_cv_prog_OCAMLOPTDOTOPT="$OCAMLOPTDOTOPT" # Let the user override the 
> test.
> +else
> +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_PYTHONPATH="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_OCAMLOPTDOTOPT="${ac_tool_prefix}ocamlopt.opt"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6331,62 +4111,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_PYTHONPATH" && ac_cv_path_PYTHONPATH="no"
> -  ;;
> -esac
>  fi
> -PYTHONPATH=$ac_cv_path_PYTHONPATH
> -if test -n "$PYTHONPATH"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHONPATH" >&5
> -$as_echo "$PYTHONPATH" >&6; }
> +fi
> +OCAMLOPTDOTOPT=$ac_cv_prog_OCAMLOPTDOTOPT
> +if test -n "$OCAMLOPTDOTOPT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLOPTDOTOPT" >&5
> +$as_echo "$OCAMLOPTDOTOPT" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> -if test x"${PYTHONPATH}" == x"no"
> -then
> -    as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" 
> "$LINENO" 5
> -fi
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python version >= 
> 2.3 " >&5
> -$as_echo_n "checking for python version >= 2.3 ... " >&6; }
> -`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 3)"))'`
> -if test "$?" != "0"
> -then
> -    python_version=`$PYTHON -V 2>&1`
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -    as_fn_error $? "$python_version is too old, minimum required version is 
> 2.3" "$LINENO" 5
> -else
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> -$as_echo "yes" >&6; }
>  fi
> -
> -ac_previous_cppflags=$CPPFLAGS
> -ac_previous_ldflags=$LDFLAGS
> -ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \
> -    print distutils.sysconfig.get_config_var("VERSION")'`
> -# Extract the first word of "$PYTHON-config", so it can be a program name 
> with args.
> -set dummy $PYTHON-config; ac_word=$2
> +if test -z "$ac_cv_prog_OCAMLOPTDOTOPT"; then
> +  ac_ct_OCAMLOPTDOTOPT=$OCAMLOPTDOTOPT
> +  # Extract the first word of "ocamlopt.opt", so it can be a program name 
> with args.
> +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_path_pyconfig+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAMLOPTDOTOPT+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $pyconfig in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_pyconfig="$pyconfig" # Let the user override the test with a 
> path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
> +  ac_cv_prog_ac_ct_OCAMLOPTDOTOPT="$ac_ct_OCAMLOPTDOTOPT" # Let the user 
> override the test.
> +else
> +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_pyconfig="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_ac_ct_OCAMLOPTDOTOPT="ocamlopt.opt"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6394,127 +4151,68 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_pyconfig" && ac_cv_path_pyconfig="no"
> -  ;;
> -esac
>  fi
> -pyconfig=$ac_cv_path_pyconfig
> -if test -n "$pyconfig"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pyconfig" >&5
> -$as_echo "$pyconfig" >&6; }
> +fi
> +ac_ct_OCAMLOPTDOTOPT=$ac_cv_prog_ac_ct_OCAMLOPTDOTOPT
> +if test -n "$ac_ct_OCAMLOPTDOTOPT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLOPTDOTOPT" >&5
> +$as_echo "$ac_ct_OCAMLOPTDOTOPT" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -
> -if test x"$pyconfig" == x"no"; then :
> -
> -        CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`"
> -    CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print distutils.sysconfig.get_config_var("CFLAGS")'`"
> -    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print distutils.sysconfig.get_config_var("LIBS")'`"
> -    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print distutils.sysconfig.get_config_var("SYSLIBS")'`"
> -    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\
> -        standard_lib=1) + "/config"'`"
> -    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print distutils.sysconfig.get_config_var("LINKFORSHARED")'`"
> -    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> -        print distutils.sysconfig.get_config_var("LDFLAGS")'`"
> -
> -else
> -
> -        CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`"
> -    LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`"
> -
> -fi
> -
> -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_ct_OCAMLOPTDOTOPT" = x; then
> +    OCAMLOPTDOTOPT="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAMLOPTDOTOPT=$ac_ct_OCAMLOPTDOTOPT
> +  fi
>  else
> -  as_fn_error $? "Unable to find Python development headers" "$LINENO" 5
> +  OCAMLOPTDOTOPT="$ac_cv_prog_OCAMLOPTDOTOPT"
>  fi
> 
> +       if test "$OCAMLOPTDOTOPT" != "no"; then
> +          TMPVERSION=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* 
> *\(.*\)$|\1|p' `
> +          if test "$TMPVERSION" != "$OCAMLVERSION" ; then
> +             { $as_echo "$as_me:${as_lineno-$LINENO}: result: version 
> differs from ocamlc; ocamlopt.opt discarded." >&5
> +$as_echo "version differs from ocamlc; ocamlopt.opt discarded." >&6; }
> +          else
> +             OCAMLOPT=$OCAMLOPTDOTOPT
> +          fi
> +        fi
> +     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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lpython$ac_python_version  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char PyArg_ParseTuple ();
> -int
> -main ()
> -{
> -return PyArg_ParseTuple ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  eval "$as_ac_Lib=yes"
> -else
> -  eval "$as_ac_Lib=no"
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_check_lib_save_LIBS
> -fi
> -eval ac_res=\$$as_ac_Lib
> -              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
> -  cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_LIBpython$ac_python_version" | $as_tr_cpp` 1
> -_ACEOF
> -
> -  LIBS="-lpython$ac_python_version $LIBS"
> 
> -else
> -  as_fn_error $? "Unable to find a suitable python development library" 
> "$LINENO" 5
> -fi
> +  fi
> 
> -CPPFLAGS=$ac_previous_cppflags
> -LDLFAGS=$ac_previous_ldflags
> 
> 
> -fi
> -# Extract the first word of "xgettext", so it can be a program name with 
> args.
> -set dummy xgettext; ac_word=$2
> +  # checking for ocaml toplevel
> +  if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocaml", so it can be a 
> program name with args.
> +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_path_XGETTEXT+set}" = set; then :
> +if test "${ac_cv_prog_OCAML+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $XGETTEXT in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a 
> path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$OCAML"; then
> +  ac_cv_prog_OCAML="$OCAML" # Let the user override the test.
> +else
> +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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_OCAML="${ac_tool_prefix}ocaml"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6522,44 +4220,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT="no"
> -  ;;
> -esac
>  fi
> -XGETTEXT=$ac_cv_path_XGETTEXT
> -if test -n "$XGETTEXT"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
> -$as_echo "$XGETTEXT" >&6; }
> +fi
> +OCAML=$ac_cv_prog_OCAML
> +if test -n "$OCAML"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAML" >&5
> +$as_echo "$OCAML" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> -if test x"${XGETTEXT}" == x"no"
> -then
> -    as_fn_error $? "Unable to find xgettext, please install xgettext" 
> "$LINENO" 5
>  fi
> -# Extract the first word of "as86", so it can be a program name with args.
> -set dummy as86; ac_word=$2
> +if test -z "$ac_cv_prog_OCAML"; then
> +  ac_ct_OCAML=$OCAML
> +  # Extract the first word of "ocaml", so it can be a program name with args.
> +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_path_AS86+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAML+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $AS86 in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_AS86="$AS86" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$ac_ct_OCAML"; then
> +  ac_cv_prog_ac_ct_OCAML="$ac_ct_OCAML" # Let the user override the test.
> +else
> +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_AS86="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_ac_ct_OCAML="ocaml"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6567,44 +4260,53 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_AS86" && ac_cv_path_AS86="no"
> -  ;;
> -esac
>  fi
> -AS86=$ac_cv_path_AS86
> -if test -n "$AS86"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS86" >&5
> -$as_echo "$AS86" >&6; }
> +fi
> +ac_ct_OCAML=$ac_cv_prog_ac_ct_OCAML
> +if test -n "$ac_ct_OCAML"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAML" >&5
> +$as_echo "$ac_ct_OCAML" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -
> -if test x"${AS86}" == x"no"
> -then
> -    as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5
> +  if test "x$ac_ct_OCAML" = x; then
> +    OCAML="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAML=$ac_ct_OCAML
> +  fi
> +else
> +  OCAML="$ac_cv_prog_OCAML"
>  fi
> -# Extract the first word of "ld86", so it can be a program name with args.
> -set dummy ld86; ac_word=$2
> +
> +
> +  # checking for ocamldep
> +  if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamldep", so it can be a 
> program name with args.
> +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_path_LD86+set}" = set; then :
> +if test "${ac_cv_prog_OCAMLDEP+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $LD86 in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_LD86="$LD86" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$OCAMLDEP"; then
> +  ac_cv_prog_OCAMLDEP="$OCAMLDEP" # Let the user override the test.
> +else
> +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_LD86="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_OCAMLDEP="${ac_tool_prefix}ocamldep"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6612,44 +4314,39 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_LD86" && ac_cv_path_LD86="no"
> -  ;;
> -esac
>  fi
> -LD86=$ac_cv_path_LD86
> -if test -n "$LD86"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD86" >&5
> -$as_echo "$LD86" >&6; }
> +fi
> +OCAMLDEP=$ac_cv_prog_OCAMLDEP
> +if test -n "$OCAMLDEP"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDEP" >&5
> +$as_echo "$OCAMLDEP" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> 
> -if test x"${LD86}" == x"no"
> -then
> -    as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5
>  fi
> -# Extract the first word of "bcc", so it can be a program name with args.
> -set dummy bcc; ac_word=$2
> +if test -z "$ac_cv_prog_OCAMLDEP"; then
> +  ac_ct_OCAMLDEP=$OCAMLDEP
> +  # Extract the first word of "ocamldep", so it can be a program name with 
> args.
> +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_path_BCC+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAMLDEP+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $BCC in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_BCC="$BCC" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$ac_ct_OCAMLDEP"; then
> +  ac_cv_prog_ac_ct_OCAMLDEP="$ac_ct_OCAMLDEP" # Let the user override the 
> test.
> +else
> +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_BCC="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_ac_ct_OCAMLDEP="ocamldep"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6657,283 +4354,241 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  test -z "$ac_cv_path_BCC" && ac_cv_path_BCC="no"
> -  ;;
> -esac
>  fi
> -BCC=$ac_cv_path_BCC
> -if test -n "$BCC"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BCC" >&5
> -$as_echo "$BCC" >&6; }
> +fi
> +ac_ct_OCAMLDEP=$ac_cv_prog_ac_ct_OCAMLDEP
> +if test -n "$ac_ct_OCAMLDEP"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDEP" >&5
> +$as_echo "$ac_ct_OCAMLDEP" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -
> -if test x"${BCC}" == x"no"
> -then
> -    as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5
> +  if test "x$ac_ct_OCAMLDEP" = x; then
> +    OCAMLDEP="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAMLDEP=$ac_ct_OCAMLDEP
> +  fi
> +else
> +  OCAMLDEP="$ac_cv_prog_OCAMLDEP"
>  fi
> -# Extract the first word of "iasl", so it can be a program name with args.
> -set dummy iasl; ac_word=$2
> +
> +
> +  # checking for ocamlmktop
> +  if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamlmktop", so it can be a 
> program name with args.
> +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_path_IASL+set}" = set; then :
> +if test "${ac_cv_prog_OCAMLMKTOP+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $IASL in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_IASL="$IASL" # Let the user override the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$OCAMLMKTOP"; then
> +  ac_cv_prog_OCAMLMKTOP="$OCAMLMKTOP" # Let the user override the test.
> +else
> +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_IASL="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_OCAMLMKTOP="${ac_tool_prefix}ocamlmktop"
>      $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_IASL" && ac_cv_path_IASL="no"
> -  ;;
> -esac
> -fi
> -IASL=$ac_cv_path_IASL
> -if test -n "$IASL"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IASL" >&5
> -$as_echo "$IASL" >&6; }
> -else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -fi
> -
> -
> -if test x"${IASL}" == x"no"
> -then
> -    as_fn_error $? "Unable to find iasl, please install iasl" "$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 :
> -
> -    { $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-luuid  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char uuid_clear ();
> -int
> -main ()
> -{
> -return uuid_clear ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_uuid_uuid_clear=yes
> -else
> -  ac_cv_lib_uuid_uuid_clear=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  libuuid="y"
> -fi
> -
> +  fi
> +done
> +  done
> +IFS=$as_save_IFS
> 
>  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 :
> -  libuuid="y"
>  fi
> -
> -
> -if test "$libuuid" != "y"; then :
> -
> -    as_fn_error $? "cannot find a valid uuid library" "$LINENO" 5
> -
> +OCAMLMKTOP=$ac_cv_prog_OCAMLMKTOP
> +if test -n "$OCAMLMKTOP"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLMKTOP" >&5
> +$as_echo "$OCAMLMKTOP" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  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 :
> -
> -    { $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 :
> +fi
> +if test -z "$ac_cv_prog_OCAMLMKTOP"; then
> +  ac_ct_OCAMLMKTOP=$OCAMLMKTOP
> +  # Extract the first word of "ocamlmktop", so it can be a program name with 
> args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lcurses  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char clear ();
> -int
> -main ()
> -{
> -return clear ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_curses_clear=yes
> +  if test -n "$ac_ct_OCAMLMKTOP"; then
> +  ac_cv_prog_ac_ct_OCAMLMKTOP="$ac_ct_OCAMLMKTOP" # Let the user override 
> the test.
>  else
> -  ac_cv_lib_curses_clear=no
> +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_prog_ac_ct_OCAMLMKTOP="ocamlmktop"
> +    $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
> +
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  curses="y"
> +ac_ct_OCAMLMKTOP=$ac_cv_prog_ac_ct_OCAMLMKTOP
> +if test -n "$ac_ct_OCAMLMKTOP"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLMKTOP" >&5
> +$as_echo "$ac_ct_OCAMLMKTOP" >&6; }
>  else
> -  curses="n"
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> 
> -
> +  if test "x$ac_ct_OCAMLMKTOP" = x; then
> +    OCAMLMKTOP="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAMLMKTOP=$ac_ct_OCAMLMKTOP
> +  fi
>  else
> -  curses="n"
> +  OCAMLMKTOP="$ac_cv_prog_OCAMLMKTOP"
>  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 :
> -
> -    { $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 :
> +  # checking for ocamlmklib
> +  if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamlmklib", so it can be a 
> program name with args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lncurses  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char clear ();
> -int
> -main ()
> -{
> -return clear ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_ncurses_clear=yes
> +  if test -n "$OCAMLMKLIB"; then
> +  ac_cv_prog_OCAMLMKLIB="$OCAMLMKLIB" # Let the user override the test.
>  else
> -  ac_cv_lib_ncurses_clear=no
> +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_prog_OCAMLMKLIB="${ac_tool_prefix}ocamlmklib"
> +    $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
> +
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  ncurses="y"
> +OCAMLMKLIB=$ac_cv_prog_OCAMLMKLIB
> +if test -n "$OCAMLMKLIB"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLMKLIB" >&5
> +$as_echo "$OCAMLMKLIB" >&6; }
>  else
> -  ncurses="n"
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> 
> 
> -else
> -  ncurses="n"
>  fi
> -
> -
> -if test "$curses" = "n" && test "$ncurses" = "n"; then :
> -
> -    as_fn_error $? "Unable to find a suitable curses library" "$LINENO" 5
> +if test -z "$ac_cv_prog_OCAMLMKLIB"; then
> +  ac_ct_OCAMLMKLIB=$OCAMLMKLIB
> +  # Extract the first word of "ocamlmklib", so it can be a program name with 
> args.
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  if test -n "$ac_ct_OCAMLMKLIB"; then
> +  ac_cv_prog_ac_ct_OCAMLMKLIB="$ac_ct_OCAMLMKLIB" # Let the user override 
> the test.
> +else
> +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_prog_ac_ct_OCAMLMKLIB="ocamlmklib"
> +    $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
> 
>  fi
> -# Prefer ncurses over curses if both are present
> -if test "$ncurses" = "y"; then :
> -
> -    CURSES_LIBS="-lncurses"
> -
> -$as_echo "#define INCLUDE_CURSES_H <ncurses.h>" >>confdefs.h
> -
> -
> +fi
> +ac_ct_OCAMLMKLIB=$ac_cv_prog_ac_ct_OCAMLMKLIB
> +if test -n "$ac_ct_OCAMLMKLIB"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLMKLIB" >&5
> +$as_echo "$ac_ct_OCAMLMKLIB" >&6; }
>  else
> -
> -    CURSES_LIBS="-lcurses"
> -
> -$as_echo "#define INCLUDE_CURSES_H <curses.h>" >>confdefs.h
> -
> -
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> 
> +  if test "x$ac_ct_OCAMLMKLIB" = x; then
> +    OCAMLMKLIB="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAMLMKLIB=$ac_ct_OCAMLMKLIB
> +  fi
> +else
> +  OCAMLMKLIB="$ac_cv_prog_OCAMLMKLIB"
> +fi
> 
> 
> -
> -
> -
> -
> -
> -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
> -       if test -n "$ac_tool_prefix"; then
> -  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a 
> program name with args.
> -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
> +  # checking for ocamldoc
> +  if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamldoc", so it can be a 
> program name with args.
> +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_path_PKG_CONFIG+set}" = set; then :
> +if test "${ac_cv_prog_OCAMLDOC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $PKG_CONFIG in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with 
> a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$OCAMLDOC"; then
> +  ac_cv_prog_OCAMLDOC="$OCAMLDOC" # Let the user override the test.
> +else
> +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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_OCAMLDOC="${ac_tool_prefix}ocamldoc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6941,13 +4596,12 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  ;;
> -esac
>  fi
> -PKG_CONFIG=$ac_cv_path_PKG_CONFIG
> -if test -n "$PKG_CONFIG"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
> -$as_echo "$PKG_CONFIG" >&6; }
> +fi
> +OCAMLDOC=$ac_cv_prog_OCAMLDOC
> +if test -n "$OCAMLDOC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLDOC" >&5
> +$as_echo "$OCAMLDOC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
> @@ -6955,28 +4609,26 @@ fi
> 
> 
>  fi
> -if test -z "$ac_cv_path_PKG_CONFIG"; then
> -  ac_pt_PKG_CONFIG=$PKG_CONFIG
> -  # Extract the first word of "pkg-config", so it can be a program name with 
> args.
> -set dummy pkg-config; ac_word=$2
> +if test -z "$ac_cv_prog_OCAMLDOC"; then
> +  ac_ct_OCAMLDOC=$OCAMLDOC
> +  # Extract the first word of "ocamldoc", so it can be a program name with 
> args.
> +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_path_ac_pt_PKG_CONFIG+set}" = set; then :
> +if test "${ac_cv_prog_ac_ct_OCAMLDOC+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  case $ac_pt_PKG_CONFIG in
> -  [\\/]* | ?:[\\/]*)
> -  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override 
> the test with a path.
> -  ;;
> -  *)
> -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +  if test -n "$ac_ct_OCAMLDOC"; then
> +  ac_cv_prog_ac_ct_OCAMLDOC="$ac_ct_OCAMLDOC" # Let the user override the 
> test.
> +else
> +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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
> +    ac_cv_prog_ac_ct_OCAMLDOC="ocamldoc"
>      $as_echo "$as_me:${as_lineno-$LINENO}: found 
> $as_dir/$ac_word$ac_exec_ext" >&5
>      break 2
>    fi
> @@ -6984,20 +4636,19 @@ done
>    done
>  IFS=$as_save_IFS
> 
> -  ;;
> -esac
>  fi
> -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
> -if test -n "$ac_pt_PKG_CONFIG"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
> -$as_echo "$ac_pt_PKG_CONFIG" >&6; }
> +fi
> +ac_ct_OCAMLDOC=$ac_cv_prog_ac_ct_OCAMLDOC
> +if test -n "$ac_ct_OCAMLDOC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLDOC" >&5
> +$as_echo "$ac_ct_OCAMLDOC" >&6; }
>  else
>    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>  $as_echo "no" >&6; }
>  fi
> 
> -  if test "x$ac_pt_PKG_CONFIG" = x; then
> -    PKG_CONFIG=""
> +  if test "x$ac_ct_OCAMLDOC" = x; then
> +    OCAMLDOC="no"
>    else
>      case $cross_compiling:$ac_tool_warned in
>  yes:)
> @@ -7005,624 +4656,718 @@ yes:)
>  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
>  ac_tool_warned=yes ;;
>  esac
> -    PKG_CONFIG=$ac_pt_PKG_CONFIG
> +    OCAMLDOC=$ac_ct_OCAMLDOC
>    fi
>  else
> -  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
> -fi
> -
> -fi
> -if test -n "$PKG_CONFIG"; then
> -       _pkg_min_version=0.9.0
> -       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at 
> least version $_pkg_min_version" >&5
> -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " 
> >&6; }
> -       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
> -               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> -$as_echo "yes" >&6; }
> -       else
> -               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -               PKG_CONFIG=""
> -       fi
> -fi
> -
> -pkg_failed=no
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib" >&5
> -$as_echo_n "checking for glib... " >&6; }
> -
> -if test -n "$glib_CFLAGS"; then
> -    pkg_cv_glib_CFLAGS="$glib_CFLAGS"
> - elif test -n "$PKG_CONFIG"; then
> -    if test -n "$PKG_CONFIG" && \
> -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
> --print-errors \"glib-2.0\""; } >&5
> -  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }; then
> -  pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
> -else
> -  pkg_failed=yes
> -fi
> - else
> -    pkg_failed=untried
> -fi
> -if test -n "$glib_LIBS"; then
> -    pkg_cv_glib_LIBS="$glib_LIBS"
> - elif test -n "$PKG_CONFIG"; then
> -    if test -n "$PKG_CONFIG" && \
> -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
> --print-errors \"glib-2.0\""; } >&5
> -  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
> -  ac_status=$?
> -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> -  test $ac_status = 0; }; then
> -  pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
> -else
> -  pkg_failed=yes
> -fi
> - else
> -    pkg_failed=untried
> -fi
> -
> -
> -
> -if test $pkg_failed = yes; then
> -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&6; }
> -
> -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
> -        _pkg_short_errors_supported=yes
> -else
> -        _pkg_short_errors_supported=no
> +  OCAMLDOC="$ac_cv_prog_OCAMLDOC"
>  fi
> -        if test $_pkg_short_errors_supported = yes; then
> -               glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
> "glib-2.0" 2>&1`
> -        else
> -               glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`
> -        fi
> -       # Put the nasty error message in config.log where it belongs
> -       echo "$glib_PKG_ERRORS" >&5
> -
> -       as_fn_error $? "Package requirements (glib-2.0) were not met:
> -
> -$glib_PKG_ERRORS
> -
> -Consider adjusting the PKG_CONFIG_PATH environment variable if you
> -installed software in a non-standard prefix.
> -
> -Alternatively, you may set the environment variables glib_CFLAGS
> -and glib_LIBS to avoid the need to call pkg-config.
> -See the pkg-config man page for more details." "$LINENO" 5
> -elif test $pkg_failed = untried; then
> -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> -$as_echo "no" >&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 $? "The pkg-config script could not be found or is too old.  
> Make sure it
> -is in your PATH or set the PKG_CONFIG environment variable to the full
> -path to pkg-config.
> 
> -Alternatively, you may set the environment variables glib_CFLAGS
> -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 ; }
> +  # checking for ocamlbuild
> +  if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}ocamlbuild", so it can be a 
> program name with args.
> +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 :
> +  $as_echo_n "(cached) " >&6
>  else
> -       glib_CFLAGS=$pkg_cv_glib_CFLAGS
> -       glib_LIBS=$pkg_cv_glib_LIBS
> -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> -$as_echo "yes" >&6; }
> -
> -fi
> -
> -# Check library path
> -if test "\${exec_prefix}/lib" = "$libdir"; then :
> -  if test "$exec_prefix" = "NONE" && test "$prefix" != "NONE"; then :
> -  exec_prefix=$prefix
> -fi
> -    if test "$exec_prefix" = "NONE"; then :
> -  exec_prefix=$ac_default_prefix
> -fi
> -    if test -d "${exec_prefix}/lib64"; then :
> -
> -        LIB_PATH="lib64"
> -
> +  if test -n "$OCAMLBUILD"; then
> +  ac_cv_prog_OCAMLBUILD="$OCAMLBUILD" # Let the user override the test.
>  else
> -
> -        LIB_PATH="lib"
> +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_prog_OCAMLBUILD="${ac_tool_prefix}ocamlbuild"
> +    $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
> 
>  fi
> -
> -else
> -
> -    LIB_PATH="${libdir:`expr length "$exec_prefix" + 1`}"
> -
>  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 :
> -
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lbz2  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char BZ2_bzDecompressInit ();
> -int
> -main ()
> -{
> -return BZ2_bzDecompressInit ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_bz2_BZ2_bzDecompressInit=yes
> +OCAMLBUILD=$ac_cv_prog_OCAMLBUILD
> +if test -n "$OCAMLBUILD"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLBUILD" >&5
> +$as_echo "$OCAMLBUILD" >&6; }
>  else
> -  ac_cv_lib_bz2_BZ2_bzDecompressInit=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  zlib="$zlib -DHAVE_BZLIB -lbz2"
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> 
> 
>  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 :
> -
> -{ $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 test -z "$ac_cv_prog_OCAMLBUILD"; then
> +  ac_ct_OCAMLBUILD=$OCAMLBUILD
> +  # Extract the first word of "ocamlbuild", so it can be a program name with 
> args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-llzma  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char lzma_stream_decoder ();
> -int
> -main ()
> -{
> -return lzma_stream_decoder ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_lzma_lzma_stream_decoder=yes
> +  if test -n "$ac_ct_OCAMLBUILD"; then
> +  ac_cv_prog_ac_ct_OCAMLBUILD="$ac_ct_OCAMLBUILD" # Let the user override 
> the test.
>  else
> -  ac_cv_lib_lzma_lzma_stream_decoder=no
> +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_prog_ac_ct_OCAMLBUILD="ocamlbuild"
> +    $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
> +
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  zlib="$zlib -DHAVE_LZMA -llzma"
> +ac_ct_OCAMLBUILD=$ac_cv_prog_ac_ct_OCAMLBUILD
> +if test -n "$ac_ct_OCAMLBUILD"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OCAMLBUILD" >&5
> +$as_echo "$ac_ct_OCAMLBUILD" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> 
> -
> +  if test "x$ac_ct_OCAMLBUILD" = x; then
> +    OCAMLBUILD="no"
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    OCAMLBUILD=$ac_ct_OCAMLBUILD
> +  fi
> +else
> +  OCAMLBUILD="$ac_cv_prog_OCAMLBUILD"
>  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$OCAMLC" = "xno"; 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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-llzo2  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +        if test "x$enable_ocamltools" = "xyes"; then :
> 
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char lzo1x_decompress ();
> -int
> -main ()
> -{
> -return lzo1x_decompress ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_lzo2_lzo1x_decompress=yes
> -else
> -  ac_cv_lib_lzo2_lzo1x_decompress=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_check_lib_save_LIBS
> +            as_fn_error $? "Ocaml tools enabled, but unable to find Ocaml" 
> "$LINENO" 5
>  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 :
> -  zlib="$zlib -DHAVE_LZO1X -llzo2"
> +        ocamltools="n"
> +
>  fi
> 
> +fi
> +# Extract the first word of "bash", so it can be a program name with args.
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $BASH in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_BASH="$BASH" # 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_BASH="$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_BASH" && ac_cv_path_BASH="no"
> +  ;;
> +esac
> +fi
> +BASH=$ac_cv_path_BASH
> +if test -n "$BASH"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
> +$as_echo "$BASH" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> 
> 
> +if test x"${BASH}" == x"no"
> +then
> +    as_fn_error $? "Unable to find bash, please install bash" "$LINENO" 5
> +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 :
> +ac_ext=c
> +ac_cpp='$CPP $CPPFLAGS'
> +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> +ac_compiler_gnu=$ac_cv_c_compiler_gnu
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C 
> preprocessor" >&5
> +$as_echo_n "checking how to run the C preprocessor... " >&6; }
> +# On Suns, sometimes $CPP names a directory.
> +if test -n "$CPP" && test -d "$CPP"; then
> +  CPP=
> +fi
> +if test -z "$CPP"; then
> +  if test "${ac_cv_prog_CPP+set}" = set; then :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-laio  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +      # Double quotes because CPP needs to be expanded
> +    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
> +    do
> +      ac_preproc_ok=false
> +for ac_c_preproc_warn_flag in '' yes
> +do
> +  # Use a header file that comes with gcc, so configuring glibc
> +  # with a fresh cross-compiler works.
> +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> +  # <limits.h> exists even on freestanding compilers.
> +  # On the NeXT, cc -E runs the code through the compiler's parser,
> +  # not just through cpp. "Syntax error" is here to catch this case.
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> +#ifdef __STDC__
> +# include <limits.h>
> +#else
> +# include <assert.h>
>  #endif
> -char io_setup ();
> -int
> -main ()
> -{
> -return io_setup ();
> -  ;
> -  return 0;
> -}
> +                    Syntax error
>  _ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_aio_io_setup=yes
> +if ac_fn_c_try_cpp "$LINENO"; then :
> +
>  else
> -  ac_cv_lib_aio_io_setup=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_check_lib_save_LIBS
> +  # Broken: fails on valid input.
> +continue
>  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 :
> -  system_aio="y"
> +rm -f conftest.err conftest.i conftest.$ac_ext
> +
> +  # OK, works on sane cases.  Now check whether nonexistent headers
> +  # can be detected and how.
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <ac_nonexistent.h>
> +_ACEOF
> +if ac_fn_c_try_cpp "$LINENO"; then :
> +  # Broken: success on invalid input.
> +continue
>  else
> -  system_aio="n"
> +  # Passes both tests.
> +ac_preproc_ok=:
> +break
> +fi
> +rm -f conftest.err conftest.i conftest.$ac_ext
> +
> +done
> +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
> +rm -f conftest.i conftest.err conftest.$ac_ext
> +if $ac_preproc_ok; then :
> +  break
>  fi
> 
> +    done
> +    ac_cv_prog_CPP=$CPP
> 
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> +fi
> +  CPP=$ac_cv_prog_CPP
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lcrypto  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_cv_prog_CPP=$CPP
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
> +$as_echo "$CPP" >&6; }
> +ac_preproc_ok=false
> +for ac_c_preproc_warn_flag in '' yes
> +do
> +  # Use a header file that comes with gcc, so configuring glibc
> +  # with a fresh cross-compiler works.
> +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> +  # <limits.h> exists even on freestanding compilers.
> +  # On the NeXT, cc -E runs the code through the compiler's parser,
> +  # not just through cpp. "Syntax error" is here to catch this case.
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> +#ifdef __STDC__
> +# include <limits.h>
> +#else
> +# include <assert.h>
>  #endif
> -char MD5 ();
> -int
> -main ()
> -{
> -return MD5 ();
> -  ;
> -  return 0;
> -}
> +                    Syntax error
>  _ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_crypto_MD5=yes
> +if ac_fn_c_try_cpp "$LINENO"; then :
> +
>  else
> -  ac_cv_lib_crypto_MD5=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_check_lib_save_LIBS
> +  # Broken: fails on valid input.
> +continue
>  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 :
> -  cat >>confdefs.h <<_ACEOF
> -#define HAVE_LIBCRYPTO 1
> +rm -f conftest.err conftest.i conftest.$ac_ext
> +
> +  # OK, works on sane cases.  Now check whether nonexistent headers
> +  # can be detected and how.
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <ac_nonexistent.h>
>  _ACEOF
> +if ac_fn_c_try_cpp "$LINENO"; then :
> +  # Broken: success on invalid input.
> +continue
> +else
> +  # Passes both tests.
> +ac_preproc_ok=:
> +break
> +fi
> +rm -f conftest.err conftest.i conftest.$ac_ext
> 
> -  LIBS="-lcrypto $LIBS"
> +done
> +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
> +rm -f conftest.i conftest.err conftest.$ac_ext
> +if $ac_preproc_ok; then :
> 
>  else
> -  as_fn_error $? "Could not find libcrypto" "$LINENO" 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 $? "C preprocessor \"$CPP\" fails sanity check
> +See \`config.log' for more details" "$LINENO" 5 ; }
>  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 :
> +ac_ext=c
> +ac_cpp='$CPP $CPPFLAGS'
> +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
> conftest.$ac_ext $LIBS >&5'
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lext2fs  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +  if test -z "$GREP"; then
> +  ac_path_GREP_found=false
> +  # Loop through the user's path and test for each of PROGNAME-LIST
> +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
> +do
> +  IFS=$as_save_IFS
> +  test -z "$as_dir" && as_dir=.
> +    for ac_prog in grep ggrep; do
> +    for ac_exec_ext in '' $ac_executable_extensions; do
> +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
> +      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
> +# Check for GNU ac_path_GREP and select it if it is found.
> +  # Check for GNU $ac_path_GREP
> +case `"$ac_path_GREP" --version 2>&1` in
> +*GNU*)
> +  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
> +*)
> +  ac_count=0
> +  $as_echo_n 0123456789 >"conftest.in"
> +  while :
> +  do
> +    cat "conftest.in" "conftest.in" >"conftest.tmp"
> +    mv "conftest.tmp" "conftest.in"
> +    cp "conftest.in" "conftest.nl"
> +    $as_echo 'GREP' >> "conftest.nl"
> +    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" 
> >"conftest.out" 2>/dev/null || break
> +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
> +    as_fn_arith $ac_count + 1 && ac_count=$as_val
> +    if test $ac_count -gt ${ac_path_GREP_max-0}; then
> +      # Best one so far, save it but keep looking for a better one
> +      ac_cv_path_GREP="$ac_path_GREP"
> +      ac_path_GREP_max=$ac_count
> +    fi
> +    # 10*(2^10) chars as input seems more than enough
> +    test $ac_count -gt 10 && break
> +  done
> +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
> +esac
> 
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char ext2fs_open2 ();
> -int
> -main ()
> -{
> -return ext2fs_open2 ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_ext2fs_ext2fs_open2=yes
> +      $ac_path_GREP_found && break 3
> +    done
> +  done
> +  done
> +IFS=$as_save_IFS
> +  if test -z "$ac_cv_path_GREP"; then
> +    as_fn_error $? "no acceptable grep could be found in 
> $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
> +  fi
>  else
> -  ac_cv_lib_ext2fs_ext2fs_open2=no
> +  ac_cv_path_GREP=$GREP
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  libext2fs="y"
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
> +$as_echo "$ac_cv_path_GREP" >&6; }
> + GREP="$ac_cv_path_GREP"
> +
> +
> +{ $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 :
> +  $as_echo_n "(cached) " >&6
>  else
> -  libext2fs="n"
> +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
> +   then ac_cv_path_EGREP="$GREP -E"
> +   else
> +     if test -z "$EGREP"; then
> +  ac_path_EGREP_found=false
> +  # Loop through the user's path and test for each of PROGNAME-LIST
> +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
> +do
> +  IFS=$as_save_IFS
> +  test -z "$as_dir" && as_dir=.
> +    for ac_prog in egrep; do
> +    for ac_exec_ext in '' $ac_executable_extensions; do
> +      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
> +      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || 
> continue
> +# Check for GNU ac_path_EGREP and select it if it is found.
> +  # Check for GNU $ac_path_EGREP
> +case `"$ac_path_EGREP" --version 2>&1` in
> +*GNU*)
> +  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
> +*)
> +  ac_count=0
> +  $as_echo_n 0123456789 >"conftest.in"
> +  while :
> +  do
> +    cat "conftest.in" "conftest.in" >"conftest.tmp"
> +    mv "conftest.tmp" "conftest.in"
> +    cp "conftest.in" "conftest.nl"
> +    $as_echo 'EGREP' >> "conftest.nl"
> +    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || 
> break
> +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
> +    as_fn_arith $ac_count + 1 && ac_count=$as_val
> +    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
> +      # Best one so far, save it but keep looking for a better one
> +      ac_cv_path_EGREP="$ac_path_EGREP"
> +      ac_path_EGREP_max=$ac_count
> +    fi
> +    # 10*(2^10) chars as input seems more than enough
> +    test $ac_count -gt 10 && break
> +  done
> +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
> +esac
> +
> +      $ac_path_EGREP_found && break 3
> +    done
> +  done
> +  done
> +IFS=$as_save_IFS
> +  if test -z "$ac_cv_path_EGREP"; then
> +    as_fn_error $? "no acceptable egrep could be found in 
> $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
> +  fi
> +else
> +  ac_cv_path_EGREP=$EGREP
>  fi
> 
> +   fi
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
> +$as_echo "$ac_cv_path_EGREP" >&6; }
> + EGREP="$ac_cv_path_EGREP"
> 
> -{ $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 :
> +
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lgcrypt  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> +#include <stdlib.h>
> +#include <stdarg.h>
> +#include <string.h>
> +#include <float.h>
> 
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char gcry_md_hash_buffer ();
>  int
>  main ()
>  {
> -return gcry_md_hash_buffer ();
> +
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_gcrypt_gcry_md_hash_buffer=yes
> +if ac_fn_c_try_compile "$LINENO"; then :
> +  ac_cv_header_stdc=yes
>  else
> -  ac_cv_lib_gcrypt_gcry_md_hash_buffer=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_check_lib_save_LIBS
> +  ac_cv_header_stdc=no
>  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 :
> -  libgcrypt="y"
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +
> +if test $ac_cv_header_stdc = yes; then
> +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <string.h>
> +
> +_ACEOF
> +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> +  $EGREP "memchr" >/dev/null 2>&1; then :
> +
>  else
> -  libgcrypt="n"
> +  ac_cv_header_stdc=no
> +fi
> +rm -f conftest*
> +
>  fi
> 
> +if test $ac_cv_header_stdc = yes; then
> +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <stdlib.h>
> 
> +_ACEOF
> +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> +  $EGREP "free" >/dev/null 2>&1; then :
> 
> -    { $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 :
> -  $as_echo_n "(cached) " >&6
>  else
> +  ac_cv_header_stdc=no
> +fi
> +rm -f conftest*
> 
> -        ax_cv_pthread_flags=-pthread
> +fi
> 
> -    PTHREAD_CFLAGS="$ax_cv_pthread_flags"
> -    PTHREAD_LDFLAGS="$ax_cv_pthread_flags"
> -    PTHREAD_LIBS=""
> +if test $ac_cv_header_stdc = yes; then
> +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
> +  if test "$cross_compiling" = yes; then :
> +  :
> +else
> +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +#include <ctype.h>
> +#include <stdlib.h>
> +#if ((' ' & 0x0FF) == 0x020)
> +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
> +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
> +#else
> +# define ISLOWER(c) \
> +                  (('a' <= (c) && (c) <= 'i') \
> +                    || ('j' <= (c) && (c) <= 'r') \
> +                    || ('s' <= (c) && (c) <= 'z'))
> +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
> +#endif
> 
> +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
> +int
> +main ()
> +{
> +  int i;
> +  for (i = 0; i < 256; i++)
> +    if (XOR (islower (i), ISLOWER (i))
> +       || toupper (i) != TOUPPER (i))
> +      return 2;
> +  return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_run "$LINENO"; then :
> 
> -    saved_CFLAGS="$CFLAGS"
> +else
> +  ac_cv_header_stdc=no
> +fi
> +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> +  conftest.$ac_objext conftest.beam conftest.$ac_ext
> +fi
> 
> -    saved_LDFLAGS="$LDFLAGS"
> +fi
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
> +$as_echo "$ac_cv_header_stdc" >&6; }
> +if test $ac_cv_header_stdc = yes; then
> 
> -    saved_LIBS="$LIBS"
> +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
> 
> +fi
> 
> -    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
> +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
> +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h 
> \
> +                 inttypes.h stdint.h unistd.h
> +do :
> +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" 
> "$ac_includes_default
> +"
> +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
> +  cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> +_ACEOF
> 
> -    LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
> +fi
> 
> -    LIBS="$LIBS $PTHREAD_LIBS"
> +done
> 
> -        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> 
> -#include <pthread.h>
> -int main(void) {
> -  pthread_atfork(0,0,0);
> -  pthread_create(0,0,0,0);
> -}
> +if test "x$pythontools" = "xy"; then :
> 
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> +    if echo "$PYTHON" | grep -q "^/"; then :
> 
> +        PYTHONPATH=$PYTHON
> +        PYTHON=`basename $PYTHONPATH`
> +
> +elif test -z "$PYTHON"; then :
> +  PYTHON="python"
>  else
> -  ax_cv_pthread_flags=failed
> +  as_fn_error $? "PYTHON specified, but is not an absolute path" "$LINENO" 5
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> +    # Extract the first word of "$PYTHON", so it can be a program name with 
> args.
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $PYTHONPATH in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_PYTHONPATH="$PYTHONPATH" # 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_PYTHONPATH="$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
> 
> -    CFLAGS="$saved_CFLAGS"
> +  test -z "$ac_cv_path_PYTHONPATH" && ac_cv_path_PYTHONPATH="no"
> +  ;;
> +esac
> +fi
> +PYTHONPATH=$ac_cv_path_PYTHONPATH
> +if test -n "$PYTHONPATH"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHONPATH" >&5
> +$as_echo "$PYTHONPATH" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +fi
> 
> -    LDFLAGS="$saved_LDFLAGS"
> 
> -    LIBS="$saved_LIBS"
> +if test x"${PYTHONPATH}" == x"no"
> +then
> +    as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" 
> "$LINENO" 5
> +fi
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python version >= 
> 2.3 " >&5
> +$as_echo_n "checking for python version >= 2.3 ... " >&6; }
> +`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 3)"))'`
> +if test "$?" != "0"
> +then
> +    python_version=`$PYTHON -V 2>&1`
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +    as_fn_error $? "$python_version is too old, minimum required version is 
> 2.3" "$LINENO" 5
> +else
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> +$as_echo "yes" >&6; }
> +fi
> 
> +ac_previous_cppflags=$CPPFLAGS
> +ac_previous_ldflags=$LDFLAGS
> +ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \
> +    print distutils.sysconfig.get_config_var("VERSION")'`
> +# Extract the first word of "$PYTHON-config", so it can be a program name 
> with args.
> +set dummy $PYTHON-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_pyconfig+set}" = set; then :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $pyconfig in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_pyconfig="$pyconfig" # 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_pyconfig="$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_pyconfig" && ac_cv_path_pyconfig="no"
> +  ;;
> +esac
> +fi
> +pyconfig=$ac_cv_path_pyconfig
> +if test -n "$pyconfig"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pyconfig" >&5
> +$as_echo "$pyconfig" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_pthread_flags" >&5
> -$as_echo "$ax_cv_pthread_flags" >&6; }
> -    if test "x$ax_cv_pthread_flags" = xfailed; then
> -        as_fn_error $? "-pthread does not work" "$LINENO" 5
> -    fi
> -
> -    PTHREAD_CFLAGS="$ax_cv_pthread_flags"
> -    PTHREAD_LDFLAGS="$ax_cv_pthread_flags"
> -    PTHREAD_LIBS=""
> 
> 
> +if test x"$pyconfig" == x"no"; then :
> 
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lrt  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +        CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print "-I" + distutils.sysconfig.get_config_var("INCLUDEPY")'`"
> +    CPPFLAGS="$CPPFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print distutils.sysconfig.get_config_var("CFLAGS")'`"
> +    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print distutils.sysconfig.get_config_var("LIBS")'`"
> +    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print distutils.sysconfig.get_config_var("SYSLIBS")'`"
> +    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print "-L" + distutils.sysconfig.get_python_lib(plat_specific=1,\
> +        standard_lib=1) + "/config"'`"
> +    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print distutils.sysconfig.get_config_var("LINKFORSHARED")'`"
> +    LDFLAGS="$LDFLAGS `$PYTHON -c 'import distutils.sysconfig; \
> +        print distutils.sysconfig.get_config_var("LDFLAGS")'`"
> 
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char clock_gettime ();
> -int
> -main ()
> -{
> -return clock_gettime ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_rt_clock_gettime=yes
>  else
> -  ac_cv_lib_rt_clock_gettime=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  cat >>confdefs.h <<_ACEOF
> -#define HAVE_LIBRT 1
> -_ACEOF
> 
> -  LIBS="-lrt $LIBS"
> +        CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`"
> +    LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`"
> 
>  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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lyajl  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +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 :
> 
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char yajl_alloc ();
> -int
> -main ()
> -{
> -return yajl_alloc ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_yajl_yajl_alloc=yes
>  else
> -  ac_cv_lib_yajl_yajl_alloc=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -LIBS=$ac_check_lib_save_LIBS
> +  as_fn_error $? "Unable to find Python development headers" "$LINENO" 5
>  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 :
> -  cat >>confdefs.h <<_ACEOF
> -#define HAVE_LIBYAJL 1
> -_ACEOF
> -
> -  LIBS="-lyajl $LIBS"
> 
> -else
> -  as_fn_error $? "Could not find yajl" "$LINENO" 5
> -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 :
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lz  $LIBS"
> +LIBS="-lpython$ac_python_version  $LIBS"
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> 
> @@ -7632,1893 +5377,1173 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  #ifdef __cplusplus
>  extern "C"
>  #endif
> -char deflateCopy ();
> +char PyArg_ParseTuple ();
>  int
>  main ()
>  {
> -return deflateCopy ();
> +return PyArg_ParseTuple ();
>    ;
>    return 0;
>  }
>  _ACEOF
>  if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_z_deflateCopy=yes
> +  eval "$as_ac_Lib=yes"
>  else
> -  ac_cv_lib_z_deflateCopy=no
> +  eval "$as_ac_Lib=no"
>  fi
>  rm -f core conftest.err conftest.$ac_objext \
>      conftest$ac_exeext conftest.$ac_ext
>  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 :
> +eval ac_res=\$$as_ac_Lib
> +              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
>    cat >>confdefs.h <<_ACEOF
> -#define HAVE_LIBZ 1
> +#define `$as_echo "HAVE_LIBpython$ac_python_version" | $as_tr_cpp` 1
>  _ACEOF
> 
> -  LIBS="-lz $LIBS"
> -
> -else
> -  as_fn_error $? "Could not find zlib" "$LINENO" 5
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_check_lib_save_LIBS=$LIBS
> -LIBS="-liconv  $LIBS"
> -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> +  LIBS="-lpython$ac_python_version $LIBS"
> 
> -/* Override any GCC internal prototype to avoid an error.
> -   Use char because int might match the return type of a GCC
> -   builtin and then its argument prototype would still apply.  */
> -#ifdef __cplusplus
> -extern "C"
> -#endif
> -char libiconv_open ();
> -int
> -main ()
> -{
> -return libiconv_open ();
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_iconv_libiconv_open=yes
> -else
> -  ac_cv_lib_iconv_libiconv_open=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -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 :
> -  libiconv="y"
>  else
> -  libiconv="n"
> +  as_fn_error $? "Unable to find a suitable python development library" 
> "$LINENO" 5
>  fi
> 
> +CPPFLAGS=$ac_previous_cppflags
> +LDLFAGS=$ac_previous_ldflags
> 
> 
> -# Checks for header files.
> -# 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 :
> +fi
> +# Extract the first word of "xgettext", so it can be a program name with 
> args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <alloca.h>
> -int
> -main ()
> -{
> -char *p = (char *) alloca (2 * sizeof (int));
> -                         if (p) return 0;
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_working_alloca_h=yes
> -else
> -  ac_cv_working_alloca_h=no
> +  case $XGETTEXT in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_XGETTEXT="$XGETTEXT" # 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_XGETTEXT="$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_XGETTEXT" && ac_cv_path_XGETTEXT="no"
> +  ;;
> +esac
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> +XGETTEXT=$ac_cv_path_XGETTEXT
> +if test -n "$XGETTEXT"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
> +$as_echo "$XGETTEXT" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
> -$as_echo "$ac_cv_working_alloca_h" >&6; }
> -if test $ac_cv_working_alloca_h = yes; then
> 
> -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
> 
> +if test x"${XGETTEXT}" == x"no"
> +then
> +    as_fn_error $? "Unable to find xgettext, please install xgettext" 
> "$LINENO" 5
>  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 :
> +# Extract the first word of "as86", so it can be a program name with args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#ifdef __GNUC__
> -# define alloca __builtin_alloca
> -#else
> -# ifdef _MSC_VER
> -#  include <malloc.h>
> -#  define alloca _alloca
> -# else
> -#  ifdef HAVE_ALLOCA_H
> -#   include <alloca.h>
> -#  else
> -#   ifdef _AIX
> - #pragma alloca
> -#   else
> -#    ifndef alloca /* predefined by HP cc +Olibcalls */
> -char *alloca ();
> -#    endif
> -#   endif
> -#  endif
> -# endif
> -#endif
> -
> -int
> -main ()
> -{
> -char *p = (char *) alloca (1);
> -                                   if (p) return 0;
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_func_alloca_works=yes
> -else
> -  ac_cv_func_alloca_works=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" 
> >&5
> -$as_echo "$ac_cv_func_alloca_works" >&6; }
> -
> -if test $ac_cv_func_alloca_works = yes; then
> -
> -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
> +  case $AS86 in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_AS86="$AS86" # 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_AS86="$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_AS86" && ac_cv_path_AS86="no"
> +  ;;
> +esac
> +fi
> +AS86=$ac_cv_path_AS86
> +if test -n "$AS86"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS86" >&5
> +$as_echo "$AS86" >&6; }
>  else
> -  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
> -# that cause trouble.  Some versions do not even contain alloca or
> -# contain a buggy version.  If you still want to use their alloca,
> -# use ar to extract alloca.o from them instead of compiling alloca.c.
> -
> -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
> -
> -$as_echo "#define C_ALLOCA 1" >>confdefs.h
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +fi
> 
> 
> -{ $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 test x"${AS86}" == x"no"
> +then
> +    as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5
> +fi
> +# Extract the first word of "ld86", so it can be a program name with args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#if defined CRAY && ! defined CRAY2
> -webecray
> -#else
> -wenotbecray
> -#endif
> +  case $LD86 in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_LD86="$LD86" # 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_LD86="$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
> 
> -_ACEOF
> -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> -  $EGREP "webecray" >/dev/null 2>&1; then :
> -  ac_cv_os_cray=yes
> -else
> -  ac_cv_os_cray=no
> +  test -z "$ac_cv_path_LD86" && ac_cv_path_LD86="no"
> +  ;;
> +esac
>  fi
> -rm -f conftest*
> -
> +LD86=$ac_cv_path_LD86
> +if test -n "$LD86"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD86" >&5
> +$as_echo "$LD86" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
> -$as_echo "$ac_cv_os_cray" >&6; }
> -if test $ac_cv_os_cray = yes; then
> -  for ac_func in _getb67 GETB67 getb67; do
> -    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
> -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
> -if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
> -
> -cat >>confdefs.h <<_ACEOF
> -#define CRAY_STACKSEG_END $ac_func
> -_ACEOF
> 
> -    break
> -fi
> 
> -  done
> +if test x"${LD86}" == x"no"
> +then
> +    as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5
>  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 :
> +# Extract the first word of "bcc", so it can be a program name with args.
> +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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_c_stack_direction=0
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$ac_includes_default
> -int
> -find_stack_direction ()
> -{
> -  static char *addr = 0;
> -  auto char dummy;
> -  if (addr == 0)
> -    {
> -      addr = &dummy;
> -      return find_stack_direction ();
> -    }
> -  else
> -    return (&dummy > addr) ? 1 : -1;
> -}
> +  case $BCC in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_BCC="$BCC" # 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_BCC="$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
> 
> -int
> -main ()
> -{
> -  return find_stack_direction () < 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_c_stack_direction=1
> -else
> -  ac_cv_c_stack_direction=-1
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> +  test -z "$ac_cv_path_BCC" && ac_cv_path_BCC="no"
> +  ;;
> +esac
>  fi
> -
> +BCC=$ac_cv_path_BCC
> +if test -n "$BCC"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BCC" >&5
> +$as_echo "$BCC" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" 
> >&5
> -$as_echo "$ac_cv_c_stack_direction" >&6; }
> -cat >>confdefs.h <<_ACEOF
> -#define STACK_DIRECTION $ac_cv_c_stack_direction
> -_ACEOF
> 
> 
> +if test x"${BCC}" == x"no"
> +then
> +    as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5
>  fi
> +# Extract the first word of "iasl", so it can be a program name with args.
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $IASL in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_IASL="$IASL" # 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_IASL="$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
> 
> -for ac_header in  \
> -                arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h \
> -                netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \
> -                strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \
> -                sys/socket.h sys/statvfs.h sys/time.h syslog.h termios.h \
> -                unistd.h yajl/yajl_version.h \
> +  test -z "$ac_cv_path_IASL" && ac_cv_path_IASL="no"
> +  ;;
> +esac
> +fi
> +IASL=$ac_cv_path_IASL
> +if test -n "$IASL"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IASL" >&5
> +$as_echo "$IASL" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +fi
> 
> -do :
> -  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" 
> "$ac_includes_default"
> -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
> -  cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> -_ACEOF
> 
> +if test x"${IASL}" == x"no"
> +then
> +    as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5
>  fi
> 
> -done
> -
> +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 :
> 
> -# 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 :
> +    { $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-luuid  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> 
> -#include <stdbool.h>
> -#ifndef bool
> - "error: bool is not defined"
> -#endif
> -#ifndef false
> - "error: false is not defined"
> -#endif
> -#if false
> - "error: false is not 0"
> -#endif
> -#ifndef true
> - "error: true is not defined"
> -#endif
> -#if true != 1
> - "error: true is not 1"
> -#endif
> -#ifndef __bool_true_false_are_defined
> - "error: __bool_true_false_are_defined is not defined"
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
>  #endif
> -
> -       struct s { _Bool s: 1; _Bool t; } s;
> -
> -       char a[true == 1 ? 1 : -1];
> -       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;
> -       char f[(_Bool) 0.0 == false ? 1 : -1];
> -       char g[true];
> -       char h[sizeof (_Bool)];
> -       char i[sizeof s.t];
> -       enum { j = false, k = true, l = false * true, m = true * 256 };
> -       /* The following fails for
> -          HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
> -       _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
> -        */
> -       _Bool q = true;
> -       _Bool *pq = &q;
> -
> +char uuid_clear ();
>  int
>  main ()
>  {
> -
> -       *pq |= q;
> -       *pq |= ! q;
> -       /* Refer to every declared value, to avoid compiler optimizations.  */
> -       return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
> -               + !m + !n + !o + !p + !q + !pq);
> -
> +return uuid_clear ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_header_stdbool_h=yes
> -else
> -  ac_cv_header_stdbool_h=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -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 :
> -
> -cat >>confdefs.h <<_ACEOF
> -#define HAVE__BOOL 1
> -_ACEOF
> -
> -
> -fi
> -
> -if test $ac_cv_header_stdbool_h = yes; then
> -
> -$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
> -
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <sys/types.h>
> -
> -_ACEOF
> -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> -  $EGREP "uid_t" >/dev/null 2>&1; then :
> -  ac_cv_type_uid_t=yes
> -else
> -  ac_cv_type_uid_t=no
> -fi
> -rm -f conftest*
> -
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
> -$as_echo "$ac_cv_type_uid_t" >&6; }
> -if test $ac_cv_type_uid_t = no; then
> -
> -$as_echo "#define uid_t int" >>confdefs.h
> -
> -
> -$as_echo "#define gid_t int" >>confdefs.h
> -
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  ac_cv_c_inline=no
> -for ac_kw in inline __inline__ __inline; do
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#ifndef __cplusplus
> -typedef int foo_t;
> -static $ac_kw foo_t static_foo () {return 0; }
> -$ac_kw foo_t foo () {return 0; }
> -#endif
> -
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_c_inline=$ac_kw
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_uuid_uuid_clear=yes
> +else
> +  ac_cv_lib_uuid_uuid_clear=no
>  fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -  test "$ac_cv_c_inline" != no && break
> -done
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +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 :
> +  libuuid="y"
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
> -$as_echo "$ac_cv_c_inline" >&6; }
> 
> -case $ac_cv_c_inline in
> -  inline | yes) ;;
> -  *)
> -    case $ac_cv_c_inline in
> -      no) ac_val=;;
> -      *) ac_val=$ac_cv_c_inline;;
> -    esac
> -    cat >>confdefs.h <<_ACEOF
> -#ifndef __cplusplus
> -#define inline $ac_val
> -#endif
> -_ACEOF
> -    ;;
> -esac
> 
> -ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t"
> -case $ac_cv_c_int16_t in #(
> -  no|yes) ;; #(
> -  *)
> +fi
> 
> -cat >>confdefs.h <<_ACEOF
> -#define int16_t $ac_cv_c_int16_t
> -_ACEOF
> -;;
> -esac
> 
> -ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
> -case $ac_cv_c_int32_t in #(
> -  no|yes) ;; #(
> -  *)
> +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 :
> +  libuuid="y"
> +fi
> 
> -cat >>confdefs.h <<_ACEOF
> -#define int32_t $ac_cv_c_int32_t
> -_ACEOF
> -;;
> -esac
> 
> -ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
> -case $ac_cv_c_int64_t in #(
> -  no|yes) ;; #(
> -  *)
> +if test "$libuuid" != "y"; then :
> 
> -cat >>confdefs.h <<_ACEOF
> -#define int64_t $ac_cv_c_int64_t
> -_ACEOF
> -;;
> -esac
> +    as_fn_error $? "cannot find a valid uuid library" "$LINENO" 5
> 
> -ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
> -case $ac_cv_c_int8_t in #(
> -  no|yes) ;; #(
> -  *)
> +fi
> 
> -cat >>confdefs.h <<_ACEOF
> -#define int8_t $ac_cv_c_int8_t
> -_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 :
> +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 :
> 
> +    { $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 :
> +  $as_echo_n "(cached) " >&6
>  else
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lcurses  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> 
> -cat >>confdefs.h <<_ACEOF
> -#define mode_t int
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char clear ();
> +int
> +main ()
> +{
> +return clear ();
> +  ;
> +  return 0;
> +}
>  _ACEOF
> -
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_curses_clear=yes
> +else
> +  ac_cv_lib_curses_clear=no
>  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 :
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +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 :
> +  curses="y"
>  else
> -
> -cat >>confdefs.h <<_ACEOF
> -#define off_t long int
> -_ACEOF
> -
> +  curses="n"
>  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 :
> 
>  else
> +  curses="n"
> +fi
> 
> -cat >>confdefs.h <<_ACEOF
> -#define pid_t int
> -_ACEOF
> 
> -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 :
> 
> -{ $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 :
> +    { $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  ac_cv_c_restrict=no
> -   # The order here caters to the fact that C++ does not require restrict.
> -   for ac_kw in __restrict __restrict__ _Restrict restrict; do
> -     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lncurses  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -typedef int * int_ptr;
> -       int foo (int_ptr $ac_kw ip) {
> -       return ip[0];
> -       }
> +
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char clear ();
>  int
>  main ()
>  {
> -int s[1];
> -       int * $ac_kw t = s;
> -       t[0] = 0;
> -       return foo(t)
> +return clear ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_c_restrict=$ac_kw
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_ncurses_clear=yes
> +else
> +  ac_cv_lib_ncurses_clear=no
>  fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -     test "$ac_cv_c_restrict" != no && break
> -   done
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_check_lib_save_LIBS
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
> -$as_echo "$ac_cv_c_restrict" >&6; }
> -
> - case $ac_cv_c_restrict in
> -   restrict) ;;
> -   no) $as_echo "#define restrict /**/" >>confdefs.h
> - ;;
> -   *)  cat >>confdefs.h <<_ACEOF
> -#define restrict $ac_cv_c_restrict
> -_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 :
> -
> +{ $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 :
> +  ncurses="y"
>  else
> -
> -cat >>confdefs.h <<_ACEOF
> -#define size_t unsigned int
> -_ACEOF
> -
> +  ncurses="n"
>  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 :
> 
>  else
> -
> -cat >>confdefs.h <<_ACEOF
> -#define ssize_t int
> -_ACEOF
> -
> +  ncurses="n"
>  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 :
> 
> -cat >>confdefs.h <<_ACEOF
> -#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
> -_ACEOF
> +if test "$curses" = "n" && test "$ncurses" = "n"; then :
> 
> +    as_fn_error $? "Unable to find a suitable curses library" "$LINENO" 5
> 
>  fi
> +# Prefer ncurses over curses if both are present
> +if test "$ncurses" = "y"; then :
> 
> -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 :
> -
> -cat >>confdefs.h <<_ACEOF
> -#define HAVE_STRUCT_STAT_ST_BLOCKS 1
> -_ACEOF
> +    CURSES_LIBS="-lncurses"
> 
> +$as_echo "#define INCLUDE_CURSES_H <ncurses.h>" >>confdefs.h
> 
> -$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
> 
>  else
> -  case " $LIBOBJS " in
> -  *" fileblocks.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
> - ;;
> -esac
> -
> -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 :
> +    CURSES_LIBS="-lcurses"
> 
> -cat >>confdefs.h <<_ACEOF
> -#define HAVE_STRUCT_STAT_ST_RDEV 1
> -_ACEOF
> +$as_echo "#define INCLUDE_CURSES_H <curses.h>" >>confdefs.h
> 
> 
>  fi
> 
> -ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
> -case $ac_cv_c_uint16_t in #(
> -  no|yes) ;; #(
> -  *)
> 
> 
> -cat >>confdefs.h <<_ACEOF
> -#define uint16_t $ac_cv_c_uint16_t
> -_ACEOF
> -;;
> -  esac
> 
> -ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
> -case $ac_cv_c_uint32_t in #(
> -  no|yes) ;; #(
> -  *)
> 
> -$as_echo "#define _UINT32_T 1" >>confdefs.h
> 
> 
> -cat >>confdefs.h <<_ACEOF
> -#define uint32_t $ac_cv_c_uint32_t
> -_ACEOF
> -;;
> -  esac
> 
> -ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
> -case $ac_cv_c_uint64_t in #(
> -  no|yes) ;; #(
> +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
> +       if test -n "$ac_tool_prefix"; then
> +  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a 
> program name with args.
> +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> +$as_echo_n "checking for $ac_word... " >&6; }
> +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $PKG_CONFIG in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
> 
> -$as_echo "#define _UINT64_T 1" >>confdefs.h
> -
> +  ;;
> +esac
> +fi
> +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
> +if test -n "$PKG_CONFIG"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
> +$as_echo "$PKG_CONFIG" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +fi
> 
> -cat >>confdefs.h <<_ACEOF
> -#define uint64_t $ac_cv_c_uint64_t
> -_ACEOF
> -;;
> -  esac
> 
> -ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
> -case $ac_cv_c_uint8_t in #(
> -  no|yes) ;; #(
> +fi
> +if test -z "$ac_cv_path_PKG_CONFIG"; then
> +  ac_pt_PKG_CONFIG=$PKG_CONFIG
> +  # Extract the first word of "pkg-config", so it can be a program name with 
> args.
> +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 :
> +  $as_echo_n "(cached) " >&6
> +else
> +  case $ac_pt_PKG_CONFIG in
> +  [\\/]* | ?:[\\/]*)
> +  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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
> 
> -$as_echo "#define _UINT8_T 1" >>confdefs.h
> -
> -
> -cat >>confdefs.h <<_ACEOF
> -#define uint8_t $ac_cv_c_uint8_t
> -_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 :
> -
> -cat >>confdefs.h <<_ACEOF
> -#define HAVE_PTRDIFF_T 1
> -_ACEOF
> -
> -
> +  ;;
> +esac
> +fi
> +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
> +if test -n "$ac_pt_PKG_CONFIG"; then
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
> +$as_echo "$ac_pt_PKG_CONFIG" >&6; }
> +else
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
>  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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <error.h>
> -int
> -main ()
> -{
> -error_at_line (0, 0, "", 0, "an error occurred");
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_error_at_line=yes
> +  if test "x$ac_pt_PKG_CONFIG" = x; then
> +    PKG_CONFIG=""
> +  else
> +    case $cross_compiling:$ac_tool_warned in
> +yes:)
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
> prefixed with host triplet" >&5
> +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
> >&2;}
> +ac_tool_warned=yes ;;
> +esac
> +    PKG_CONFIG=$ac_pt_PKG_CONFIG
> +  fi
>  else
> -  ac_cv_lib_error_at_line=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> +  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" 
> >&5
> -$as_echo "$ac_cv_lib_error_at_line" >&6; }
> -if test $ac_cv_lib_error_at_line = no; then
> -  case " $LIBOBJS " in
> -  *" error.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS error.$ac_objext"
> - ;;
> -esac
> 
>  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 :
> -  cat >>confdefs.h <<_ACEOF
> -#define HAVE_VFORK_H 1
> -_ACEOF
> -
> +if test -n "$PKG_CONFIG"; then
> +       _pkg_min_version=0.9.0
> +       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at 
> least version $_pkg_min_version" >&5
> +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " 
> >&6; }
> +       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
> +               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> +$as_echo "yes" >&6; }
> +       else
> +               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +               PKG_CONFIG=""
> +       fi
>  fi
> 
> -done
> -
> -for ac_func in fork vfork
> -do :
> -  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
> -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
> -if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
> -  cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
> -_ACEOF
> -
> -fi
> -done
> +pkg_failed=no
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib" >&5
> +$as_echo_n "checking for glib... " >&6; }
> 
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_fork_works=cross
> +if test -n "$glib_CFLAGS"; then
> +    pkg_cv_glib_CFLAGS="$glib_CFLAGS"
> + elif test -n "$PKG_CONFIG"; then
> +    if test -n "$PKG_CONFIG" && \
> +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
> --print-errors \"glib-2.0\""; } >&5
> +  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }; then
> +  pkg_cv_glib_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -$ac_includes_default
> -int
> -main ()
> -{
> -
> -         /* By Ruediger Kuhlmann. */
> -         return fork () < 0;
> -
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_fork_works=yes
> +  pkg_failed=yes
> +fi
> + else
> +    pkg_failed=untried
> +fi
> +if test -n "$glib_LIBS"; then
> +    pkg_cv_glib_LIBS="$glib_LIBS"
> + elif test -n "$PKG_CONFIG"; then
> +    if test -n "$PKG_CONFIG" && \
> +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
> --print-errors \"glib-2.0\""; } >&5
> +  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
> +  ac_status=$?
> +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> +  test $ac_status = 0; }; then
> +  pkg_cv_glib_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
>  else
> -  ac_cv_func_fork_works=no
> +  pkg_failed=yes
>  fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> + else
> +    pkg_failed=untried
>  fi
> 
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
> -$as_echo "$ac_cv_func_fork_works" >&6; }
> 
> +
> +if test $pkg_failed = yes; then
> +       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&6; }
> +
> +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
> +        _pkg_short_errors_supported=yes
>  else
> -  ac_cv_func_fork_works=$ac_cv_func_fork
> +        _pkg_short_errors_supported=no
>  fi
> -if test "x$ac_cv_func_fork_works" = xcross; then
> -  case $host in
> -    *-*-amigaos* | *-*-msdosdjgpp*)
> -      # Override, as these systems have only a dummy fork() stub
> -      ac_cv_func_fork_works=no
> -      ;;
> -    *)
> -      ac_cv_func_fork_works=yes
> -      ;;
> -  esac
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result 
> $ac_cv_func_fork_works guessed because of cross compilation" >&5
> -$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of 
> cross compilation" >&2;}
> -fi
> -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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_vfork_works=cross
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -/* Thanks to Paul Eggert for this test.  */
> -$ac_includes_default
> -#include <sys/wait.h>
> -#ifdef HAVE_VFORK_H
> -# include <vfork.h>
> -#endif
> -/* On some sparc systems, changes by the child to local and incoming
> -   argument registers are propagated back to the parent.  The compiler
> -   is told about this with #include <vfork.h>, but some compilers
> -   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
> -   static variable whose address is put into a register that is
> -   clobbered by the vfork.  */
> -static void
> -#ifdef __cplusplus
> -sparc_address_test (int arg)
> -# else
> -sparc_address_test (arg) int arg;
> -#endif
> -{
> -  static pid_t child;
> -  if (!child) {
> -    child = vfork ();
> -    if (child < 0) {
> -      perror ("vfork");
> -      _exit(2);
> -    }
> -    if (!child) {
> -      arg = getpid();
> -      write(-1, "", 0);
> -      _exit (arg);
> -    }
> -  }
> -}
> +        if test $_pkg_short_errors_supported = yes; then
> +               glib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
> "glib-2.0" 2>&1`
> +        else
> +               glib_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`
> +        fi
> +       # Put the nasty error message in config.log where it belongs
> +       echo "$glib_PKG_ERRORS" >&5
> 
> -int
> -main ()
> -{
> -  pid_t parent = getpid ();
> -  pid_t child;
> -
> -  sparc_address_test (0);
> -
> -  child = vfork ();
> -
> -  if (child == 0) {
> -    /* Here is another test for sparc vfork register problems.  This
> -       test uses lots of local variables, at least as many local
> -       variables as main has allocated so far including compiler
> -       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
> -       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
> -       reuse the register of parent for one of the local variables,
> -       since it will think that parent can't possibly be used any more
> -       in this routine.  Assigning to the local variable will thus
> -       munge parent in the parent process.  */
> -    pid_t
> -      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
> -      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
> -    /* Convince the compiler that p..p7 are live; otherwise, it might
> -       use the same hardware register for all 8 local variables.  */
> -    if (p != p1 || p != p2 || p != p3 || p != p4
> -       || p != p5 || p != p6 || p != p7)
> -      _exit(1);
> -
> -    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
> -       from child file descriptors.  If the child closes a descriptor
> -       before it execs or exits, this munges the parent's descriptor
> -       as well.  Test for this by closing stdout in the child.  */
> -    _exit(close(fileno(stdout)) != 0);
> -  } else {
> -    int status;
> -    struct stat st;
> +       as_fn_error $? "Package requirements (glib-2.0) were not met:
> 
> -    while (wait(&status) != child)
> -      ;
> -    return (
> -        /* Was there some problem with vforking?  */
> -        child < 0
> +$glib_PKG_ERRORS
> 
> -        /* Did the child fail?  (This shouldn't happen.)  */
> -        || status
> +Consider adjusting the PKG_CONFIG_PATH environment variable if you
> +installed software in a non-standard prefix.
> 
> -        /* Did the vfork/compiler bug occur?  */
> -        || parent != getpid()
> +Alternatively, you may set the environment variables glib_CFLAGS
> +and glib_LIBS to avoid the need to call pkg-config.
> +See the pkg-config man page for more details." "$LINENO" 5
> +elif test $pkg_failed = untried; then
> +       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +$as_echo "no" >&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 $? "The pkg-config script could not be found or is too old.  
> Make sure it
> +is in your PATH or set the PKG_CONFIG environment variable to the full
> +path to pkg-config.
> 
> -        /* Did the file descriptor bug occur?  */
> -        || fstat(fileno(stdout), &st) != 0
> -        );
> -  }
> -}
> -_ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_vfork_works=yes
> +Alternatively, you may set the environment variables glib_CFLAGS
> +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 ; }
>  else
> -  ac_cv_func_vfork_works=no
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> -fi
> +       glib_CFLAGS=$pkg_cv_glib_CFLAGS
> +       glib_LIBS=$pkg_cv_glib_LIBS
> +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> +$as_echo "yes" >&6; }
> 
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
> -$as_echo "$ac_cv_func_vfork_works" >&6; }
> 
> -fi;
> -if test "x$ac_cv_func_fork_works" = xcross; then
> -  ac_cv_func_vfork_works=$ac_cv_func_vfork
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result 
> $ac_cv_func_vfork_works guessed because of cross compilation" >&5
> -$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of 
> cross compilation" >&2;}
> +# Check library path
> +if test "\${exec_prefix}/lib" = "$libdir"; then :
> +  if test "$exec_prefix" = "NONE" && test "$prefix" != "NONE"; then :
> +  exec_prefix=$prefix
>  fi
> +    if test "$exec_prefix" = "NONE"; then :
> +  exec_prefix=$ac_default_prefix
> +fi
> +    if test -d "${exec_prefix}/lib64"; then :
> 
> -if test "x$ac_cv_func_vfork_works" = xyes; then
> -
> -$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
> +        LIB_PATH="lib64"
> 
>  else
> 
> -$as_echo "#define vfork fork" >>confdefs.h
> +        LIB_PATH="lib"
> 
>  fi
> -if test "x$ac_cv_func_fork_works" = xyes; then
> 
> -$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
> +else
> 
> -fi
> +    LIB_PATH="${libdir:`expr length "$exec_prefix" + 1`}"
> 
> -{ $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 :
> -  $as_echo_n "(cached) " >&6
> -else
> -  while :; do
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include <sys/types.h> /* for off_t */
> -     #include <stdio.h>
> -int
> -main ()
> -{
> -int (*fp) (FILE *, off_t, int) = fseeko;
> -     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_sys_largefile_source=no; break
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#define _LARGEFILE_SOURCE 1
> -#include <sys/types.h> /* for off_t */
> -     #include <stdio.h>
> -int
> -main ()
> -{
> -int (*fp) (FILE *, off_t, int) = fseeko;
> -     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_sys_largefile_source=1; break
>  fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -  ac_cv_sys_largefile_source=unknown
> -  break
> -done
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_sys_largefile_source" >&5
> -$as_echo "$ac_cv_sys_largefile_source" >&6; }
> -case $ac_cv_sys_largefile_source in #(
> -  no | unknown) ;;
> -  *)
> -cat >>confdefs.h <<_ACEOF
> -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
> -_ACEOF
> -;;
> -esac
> -rm -rf conftest*
> -
> -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
> -# in glibc 2.1.3, but that breaks too many other things.
> -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
> -if test $ac_cv_sys_largefile_source != unknown; then
> 
> -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
> 
> -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 :
> 
> -{ $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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  rm -f conftest.sym conftest.file
> -echo >conftest.file
> -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_lstat_dereferences_slashed_symlink=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lbz2  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -$ac_includes_default
> +
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char BZ2_bzDecompressInit ();
>  int
>  main ()
>  {
> -struct stat sbuf;
> -     /* Linux will dereference the symlink and fail, as required by POSIX.
> -       That is better in the sense that it means we will not
> -       have to compile and use the lstat wrapper.  */
> -     return lstat ("conftest.sym/", &sbuf) == 0;
> +return BZ2_bzDecompressInit ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_lstat_dereferences_slashed_symlink=yes
> -else
> -  ac_cv_func_lstat_dereferences_slashed_symlink=no
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> -fi
> -
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_bz2_BZ2_bzDecompressInit=yes
>  else
> -  # If the `ln -s' command failed, then we probably don't even
> -  # have an lstat function.
> -  ac_cv_func_lstat_dereferences_slashed_symlink=no
> +  ac_cv_lib_bz2_BZ2_bzDecompressInit=no
>  fi
> -rm -f conftest.sym conftest.file
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +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 :
> +  zlib="$zlib -DHAVE_BZLIB -lbz2"
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
> -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
> -
> -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
> 
> -cat >>confdefs.h <<_ACEOF
> -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
> -_ACEOF
> 
> +fi
> 
> -if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
> -  case " $LIBOBJS " in
> -  *" lstat.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
> - ;;
> -esac
> 
> -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 :
> 
> -{ $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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-llzma  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -#include <sys/types.h>
> +
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char lzma_stream_decoder ();
>  int
>  main ()
>  {
> -return makedev(0, 0);
> +return lzma_stream_decoder ();
>    ;
>    return 0;
>  }
>  _ACEOF
>  if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_header_sys_types_h_makedev=yes
> +  ac_cv_lib_lzma_lzma_stream_decoder=yes
>  else
> -  ac_cv_header_sys_types_h_makedev=no
> +  ac_cv_lib_lzma_lzma_stream_decoder=no
>  fi
>  rm -f core conftest.err conftest.$ac_objext \
>      conftest$ac_exeext conftest.$ac_ext
> -
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_header_sys_types_h_makedev" >&5
> -$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 :
> -
> -$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
> -
> +LIBS=$ac_check_lib_save_LIBS
>  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 :
> -
> -$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
> -
> +{ $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 :
> +  zlib="$zlib -DHAVE_LZMA -llzma"
>  fi
> 
> 
> -  fi
>  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 :
> -  cat >>confdefs.h <<_ACEOF
> -#define HAVE_STDLIB_H 1
> -_ACEOF
> -
> -fi
> 
> -done
> +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 :
> 
> -{ $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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_malloc_0_nonnull=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-llzo2  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -#if defined STDC_HEADERS || defined HAVE_STDLIB_H
> -# include <stdlib.h>
> -#else
> -char *malloc ();
> -#endif
> 
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char lzo1x_decompress ();
>  int
>  main ()
>  {
> -return ! malloc (0);
> +return lzo1x_decompress ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_malloc_0_nonnull=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_lzo2_lzo1x_decompress=yes
>  else
> -  ac_cv_func_malloc_0_nonnull=no
> +  ac_cv_lib_lzo2_lzo1x_decompress=no
>  fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +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 :
> +  zlib="$zlib -DHAVE_LZO1X -llzo2"
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_func_malloc_0_nonnull" >&5
> -$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
> -if test $ac_cv_func_malloc_0_nonnull = yes; then :
> -
> -$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
> -
> -else
> -  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
> -
> -   case " $LIBOBJS " in
> -  *" malloc.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
> - ;;
> -esac
> -
> 
> -$as_echo "#define malloc rpl_malloc" >>confdefs.h
> 
>  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 :
> +
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-laio  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -#include <sys/types.h>
> -#include <sys/time.h>
> -#include <time.h>
> 
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char io_setup ();
>  int
>  main ()
>  {
> -if ((struct tm *) 0)
> -return 0;
> +return io_setup ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  ac_cv_header_time=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_aio_io_setup=yes
>  else
> -  ac_cv_header_time=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
> -$as_echo "$ac_cv_header_time" >&6; }
> -if test $ac_cv_header_time = yes; then
> -
> -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
> -
> +  ac_cv_lib_aio_io_setup=no
>  fi
> -
> -
> -
> -
> -  for ac_header in $ac_header_list
> -do :
> -  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" 
> "$ac_includes_default
> -"
> -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
> -  cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> -_ACEOF
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_check_lib_save_LIBS
>  fi
> -
> -done
> -
> -
> -
> -
> -
> -
> -
> -
> -  for ac_func in $ac_func_list
> -do :
> -  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
> -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
> -if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
> -  cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
> -_ACEOF
> -
> +{ $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 :
> +  system_aio="y"
> +else
> +  system_aio="n"
>  fi
> -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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_working_mktime=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lcrypto  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -/* Test program from Paul Eggert and Tony Leneis.  */
> -#ifdef TIME_WITH_SYS_TIME
> -# include <sys/time.h>
> -# include <time.h>
> -#else
> -# ifdef HAVE_SYS_TIME_H
> -#  include <sys/time.h>
> -# else
> -#  include <time.h>
> -# endif
> -#endif
> -
> -#include <limits.h>
> -#include <stdlib.h>
> 
> -#ifdef HAVE_UNISTD_H
> -# include <unistd.h>
> -#endif
> -
> -#ifndef HAVE_ALARM
> -# define alarm(X) /* empty */
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
>  #endif
> -
> -/* Work around redefinition to rpl_putenv by other config tests.  */
> -#undef putenv
> -
> -static time_t time_t_max;
> -static time_t time_t_min;
> -
> -/* Values we'll use to set the TZ environment variable.  */
> -static const char *tz_strings[] = {
> -  (const char *) 0, "TZ=GMT0", "TZ=JST-9",
> -  "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
> -};
> -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
> -
> -/* Return 0 if mktime fails to convert a date in the spring-forward gap.
> -   Based on a problem report from Andreas Jaeger.  */
> -static int
> -spring_forward_gap ()
> -{
> -  /* glibc (up to about 1998-10-07) failed this test. */
> -  struct tm tm;
> -
> -  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
> -     instead of "TZ=America/Vancouver" in order to detect the bug even
> -     on systems that don't support the Olson extension, or don't have the
> -     full zoneinfo tables installed.  */
> -  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
> -
> -  tm.tm_year = 98;
> -  tm.tm_mon = 3;
> -  tm.tm_mday = 5;
> -  tm.tm_hour = 2;
> -  tm.tm_min = 0;
> -  tm.tm_sec = 0;
> -  tm.tm_isdst = -1;
> -  return mktime (&tm) != (time_t) -1;
> -}
> -
> -static int
> -mktime_test1 (time_t now)
> -{
> -  struct tm *lt;
> -  return ! (lt = localtime (&now)) || mktime (lt) == now;
> -}
> -
> -static int
> -mktime_test (time_t now)
> -{
> -  return (mktime_test1 (now)
> -         && mktime_test1 ((time_t) (time_t_max - now))
> -         && mktime_test1 ((time_t) (time_t_min + now)));
> -}
> -
> -static int
> -irix_6_4_bug ()
> -{
> -  /* Based on code from Ariel Faigon.  */
> -  struct tm tm;
> -  tm.tm_year = 96;
> -  tm.tm_mon = 3;
> -  tm.tm_mday = 0;
> -  tm.tm_hour = 0;
> -  tm.tm_min = 0;
> -  tm.tm_sec = 0;
> -  tm.tm_isdst = -1;
> -  mktime (&tm);
> -  return tm.tm_mon == 2 && tm.tm_mday == 31;
> -}
> -
> -static int
> -bigtime_test (int j)
> -{
> -  struct tm tm;
> -  time_t now;
> -  tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = 
> j;
> -  now = mktime (&tm);
> -  if (now != (time_t) -1)
> -    {
> -      struct tm *lt = localtime (&now);
> -      if (! (lt
> -            && lt->tm_year == tm.tm_year
> -            && lt->tm_mon == tm.tm_mon
> -            && lt->tm_mday == tm.tm_mday
> -            && lt->tm_hour == tm.tm_hour
> -            && lt->tm_min == tm.tm_min
> -            && lt->tm_sec == tm.tm_sec
> -            && lt->tm_yday == tm.tm_yday
> -            && lt->tm_wday == tm.tm_wday
> -            && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
> -                 == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
> -       return 0;
> -    }
> -  return 1;
> -}
> -
> -static int
> -year_2050_test ()
> -{
> -  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
> -     ignoring leap seconds.  */
> -  unsigned long int answer = 2527315200UL;
> -
> -  struct tm tm;
> -  time_t t;
> -  tm.tm_year = 2050 - 1900;
> -  tm.tm_mon = 2 - 1;
> -  tm.tm_mday = 1;
> -  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
> -  tm.tm_isdst = -1;
> -
> -  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
> -     instead of "TZ=America/Vancouver" in order to detect the bug even
> -     on systems that don't support the Olson extension, or don't have the
> -     full zoneinfo tables installed.  */
> -  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
> -
> -  t = mktime (&tm);
> -
> -  /* Check that the result is either a failure, or close enough
> -     to the correct answer that we can assume the discrepancy is
> -     due to leap seconds.  */
> -  return (t == (time_t) -1
> -         || (0 < t && answer - 120 <= t && t <= answer + 120));
> -}
> -
> +char MD5 ();
>  int
>  main ()
>  {
> -  time_t t, delta;
> -  int i, j;
> -
> -  /* This test makes some buggy mktime implementations loop.
> -     Give up after 60 seconds; a mktime slower than that
> -     isn't worth using anyway.  */
> -  alarm (60);
> -
> -  for (;;)
> -    {
> -      t = (time_t_max << 1) + 1;
> -      if (t <= time_t_max)
> -       break;
> -      time_t_max = t;
> -    }
> -  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
> -
> -  delta = time_t_max / 997; /* a suitable prime number */
> -  for (i = 0; i < N_STRINGS; i++)
> -    {
> -      if (tz_strings[i])
> -       putenv ((char*) tz_strings[i]);
> -
> -      for (t = 0; t <= time_t_max - delta; t += delta)
> -       if (! mktime_test (t))
> -         return 1;
> -      if (! (mktime_test ((time_t) 1)
> -            && mktime_test ((time_t) (60 * 60))
> -            && mktime_test ((time_t) (60 * 60 * 24))))
> -       return 1;
> -
> -      for (j = 1; ; j <<= 1)
> -       if (! bigtime_test (j))
> -         return 1;
> -       else if (INT_MAX / 2 < j)
> -         break;
> -      if (! bigtime_test (INT_MAX))
> -       return 1;
> -    }
> -  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
> +return MD5 ();
> +  ;
> +  return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_working_mktime=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_crypto_MD5=yes
>  else
> -  ac_cv_func_working_mktime=no
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> -fi
> -
> +  ac_cv_lib_crypto_MD5=no
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" 
> >&5
> -$as_echo "$ac_cv_func_working_mktime" >&6; }
> -if test $ac_cv_func_working_mktime = no; then
> -  case " $LIBOBJS " in
> -  *" mktime.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS mktime.$ac_objext"
> - ;;
> -esac
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_check_lib_save_LIBS
>  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 :
> +{ $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 :
>    cat >>confdefs.h <<_ACEOF
> -#define HAVE_GETPAGESIZE 1
> +#define HAVE_LIBCRYPTO 1
>  _ACEOF
> 
> +  LIBS="-lcrypto $LIBS"
> +
> +else
> +  as_fn_error $? "Could not find libcrypto" "$LINENO" 5
>  fi
> -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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_mmap_fixed_mapped=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lext2fs  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -$ac_includes_default
> -/* malloc might have been renamed as rpl_malloc. */
> -#undef malloc
> -
> -/* Thanks to Mike Haertel and Jim Avera for this test.
> -   Here is a matrix of mmap possibilities:
> -       mmap private not fixed
> -       mmap private fixed at somewhere currently unmapped
> -       mmap private fixed at somewhere already mapped
> -       mmap shared not fixed
> -       mmap shared fixed at somewhere currently unmapped
> -       mmap shared fixed at somewhere already mapped
> -   For private mappings, we should verify that changes cannot be read()
> -   back from the file, nor mmap's back from the file at a different
> -   address.  (There have been systems where private was not correctly
> -   implemented like the infamous i386 svr4.0, and systems where the
> -   VM page cache was not coherent with the file system buffer cache
> -   like early versions of FreeBSD and possibly contemporary NetBSD.)
> -   For shared mappings, we should conversely verify that changes get
> -   propagated back to all the places they're supposed to be.
> -
> -   Grep wants private fixed already mapped.
> -   The main things grep needs to know about mmap are:
> -   * does it exist and is it safe to write into the mmap'd area
> -   * how to use it (BSD variants)  */
> -
> -#include <fcntl.h>
> -#include <sys/mman.h>
> -
> -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
> -char *malloc ();
> -#endif
> -
> -/* This mess was copied from the GNU getpagesize.h.  */
> -#ifndef HAVE_GETPAGESIZE
> -# ifdef _SC_PAGESIZE
> -#  define getpagesize() sysconf(_SC_PAGESIZE)
> -# else /* no _SC_PAGESIZE */
> -#  ifdef HAVE_SYS_PARAM_H
> -#   include <sys/param.h>
> -#   ifdef EXEC_PAGESIZE
> -#    define getpagesize() EXEC_PAGESIZE
> -#   else /* no EXEC_PAGESIZE */
> -#    ifdef NBPG
> -#     define getpagesize() NBPG * CLSIZE
> -#     ifndef CLSIZE
> -#      define CLSIZE 1
> -#     endif /* no CLSIZE */
> -#    else /* no NBPG */
> -#     ifdef NBPC
> -#      define getpagesize() NBPC
> -#     else /* no NBPC */
> -#      ifdef PAGESIZE
> -#       define getpagesize() PAGESIZE
> -#      endif /* PAGESIZE */
> -#     endif /* no NBPC */
> -#    endif /* no NBPG */
> -#   endif /* no EXEC_PAGESIZE */
> -#  else /* no HAVE_SYS_PARAM_H */
> -#   define getpagesize() 8192  /* punt totally */
> -#  endif /* no HAVE_SYS_PARAM_H */
> -# endif /* no _SC_PAGESIZE */
> -
> -#endif /* no HAVE_GETPAGESIZE */
> 
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char ext2fs_open2 ();
>  int
>  main ()
>  {
> -  char *data, *data2, *data3;
> -  const char *cdata2;
> -  int i, pagesize;
> -  int fd, fd2;
> -
> -  pagesize = getpagesize ();
> -
> -  /* First, make a file with some known garbage in it. */
> -  data = (char *) malloc (pagesize);
> -  if (!data)
> -    return 1;
> -  for (i = 0; i < pagesize; ++i)
> -    *(data + i) = rand ();
> -  umask (0);
> -  fd = creat ("conftest.mmap", 0600);
> -  if (fd < 0)
> -    return 2;
> -  if (write (fd, data, pagesize) != pagesize)
> -    return 3;
> -  close (fd);
> -
> -  /* Next, check that the tail of a page is zero-filled.  File must have
> -     non-zero length, otherwise we risk SIGBUS for entire page.  */
> -  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
> -  if (fd2 < 0)
> -    return 4;
> -  cdata2 = "";
> -  if (write (fd2, cdata2, 1) != 1)
> -    return 5;
> -  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, 
> fd2, 0L);
> -  if (data2 == MAP_FAILED)
> -    return 6;
> -  for (i = 0; i < pagesize; ++i)
> -    if (*(data2 + i))
> -      return 7;
> -  close (fd2);
> -  if (munmap (data2, pagesize))
> -    return 8;
> -
> -  /* Next, try to mmap the file at a fixed address which already has
> -     something else allocated at it.  If we can, also make sure that
> -     we see the same garbage.  */
> -  fd = open ("conftest.mmap", O_RDWR);
> -  if (fd < 0)
> -    return 9;
> -  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
> -                    MAP_PRIVATE | MAP_FIXED, fd, 0L))
> -    return 10;
> -  for (i = 0; i < pagesize; ++i)
> -    if (*(data + i) != *(data2 + i))
> -      return 11;
> -
> -  /* Finally, make sure that changes to the mapped area do not
> -     percolate back to the file as seen by read().  (This is a bug on
> -     some variants of i386 svr4.0.)  */
> -  for (i = 0; i < pagesize; ++i)
> -    *(data2 + i) = *(data2 + i) + 1;
> -  data3 = (char *) malloc (pagesize);
> -  if (!data3)
> -    return 12;
> -  if (read (fd, data3, pagesize) != pagesize)
> -    return 13;
> -  for (i = 0; i < pagesize; ++i)
> -    if (*(data + i) != *(data3 + i))
> -      return 14;
> -  close (fd);
> +return ext2fs_open2 ();
> +  ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_mmap_fixed_mapped=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_ext2fs_ext2fs_open2=yes
>  else
> -  ac_cv_func_mmap_fixed_mapped=no
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> -fi
> -
> +  ac_cv_lib_ext2fs_ext2fs_open2=no
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_func_mmap_fixed_mapped" >&5
> -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
> -if test $ac_cv_func_mmap_fixed_mapped = yes; then
> -
> -$as_echo "#define HAVE_MMAP 1" >>confdefs.h
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_check_lib_save_LIBS
>  fi
> -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 :
> -  cat >>confdefs.h <<_ACEOF
> -#define HAVE_STDLIB_H 1
> -_ACEOF
> -
> +{ $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 :
> +  libext2fs="y"
> +else
> +  libext2fs="n"
>  fi
> 
> -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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_realloc_0_nonnull=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lgcrypt  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -#if defined STDC_HEADERS || defined HAVE_STDLIB_H
> -# include <stdlib.h>
> -#else
> -char *realloc ();
> -#endif
> 
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char gcry_md_hash_buffer ();
>  int
>  main ()
>  {
> -return ! realloc (0, 0);
> +return gcry_md_hash_buffer ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_realloc_0_nonnull=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_gcrypt_gcry_md_hash_buffer=yes
>  else
> -  ac_cv_func_realloc_0_nonnull=no
> +  ac_cv_lib_gcrypt_gcry_md_hash_buffer=no
>  fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +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 :
> +  libgcrypt="y"
> +else
> +  libgcrypt="n"
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_func_realloc_0_nonnull" >&5
> -$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
> -if test $ac_cv_func_realloc_0_nonnull = yes; then :
> 
> -$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
> 
> +
> +    { $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 :
> +  $as_echo_n "(cached) " >&6
>  else
> -  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
> 
> -   case " $LIBOBJS " in
> -  *" realloc.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
> - ;;
> -esac
> +        ax_cv_pthread_flags=-pthread
> +
> +    PTHREAD_CFLAGS="$ax_cv_pthread_flags"
> +    PTHREAD_LDFLAGS="$ax_cv_pthread_flags"
> +    PTHREAD_LIBS=""
> +
> +
> +    saved_CFLAGS="$CFLAGS"
> +
> +    saved_LDFLAGS="$LDFLAGS"
> +
> +    saved_LIBS="$LIBS"
> +
> +
> +    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
> +
> +    LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
> +
> +    LIBS="$LIBS $PTHREAD_LIBS"
> +
> +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h.  */
> +
> +#include <pthread.h>
> +int main(void) {
> +  pthread_atfork(0,0,0);
> +  pthread_create(0,0,0,0);
> +}
> +
> +_ACEOF
> +if ac_fn_c_try_link "$LINENO"; then :
> +
> +else
> +  ax_cv_pthread_flags=failed
> +fi
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +
> +    CFLAGS="$saved_CFLAGS"
> +
> +    LDFLAGS="$saved_LDFLAGS"
> 
> +    LIBS="$saved_LIBS"
> 
> -$as_echo "#define realloc rpl_realloc" >>confdefs.h
> 
>  fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_pthread_flags" >&5
> +$as_echo "$ax_cv_pthread_flags" >&6; }
> +    if test "x$ax_cv_pthread_flags" = xfailed; then
> +        as_fn_error $? "-pthread does not work" "$LINENO" 5
> +    fi
> +
> +    PTHREAD_CFLAGS="$ax_cv_pthread_flags"
> +    PTHREAD_LDFLAGS="$ax_cv_pthread_flags"
> +    PTHREAD_LIBS=""
> +
> 
> 
> -{ $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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_strnlen_working=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lyajl  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> -$ac_includes_default
> +
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char yajl_alloc ();
>  int
>  main ()
>  {
> -
> -#define S "foobar"
> -#define S_LEN (sizeof S - 1)
> -
> -  /* At least one implementation is buggy: that of AIX 4.3 would
> -     give strnlen (S, 1) == 3.  */
> -
> -  int i;
> -  for (i = 0; i < S_LEN + 1; ++i)
> -    {
> -      int expected = i <= S_LEN ? i : S_LEN;
> -      if (strnlen (S, i) != expected)
> -       return 1;
> -    }
> -  return 0;
> -
> +return yajl_alloc ();
>    ;
>    return 0;
>  }
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_strnlen_working=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_yajl_yajl_alloc=yes
>  else
> -  ac_cv_func_strnlen_working=no
> +  ac_cv_lib_yajl_yajl_alloc=no
>  fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +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 :
> +  cat >>confdefs.h <<_ACEOF
> +#define HAVE_LIBYAJL 1
> +_ACEOF
> 
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
> $ac_cv_func_strnlen_working" >&5
> -$as_echo "$ac_cv_func_strnlen_working" >&6; }
> -test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in
> -  *" strnlen.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
> - ;;
> -esac
> +  LIBS="-lyajl $LIBS"
> 
> +else
> +  as_fn_error $? "Could not find yajl" "$LINENO" 5
> +fi
> 
> -{ $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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
> -  if test "$cross_compiling" = yes; then :
> -  ac_cv_func_strtod=no
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +  ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lz  $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> 
> -$ac_includes_default
> -#ifndef strtod
> -double strtod ();
> +/* Override any GCC internal prototype to avoid an error.
> +   Use char because int might match the return type of a GCC
> +   builtin and then its argument prototype would still apply.  */
> +#ifdef __cplusplus
> +extern "C"
>  #endif
> +char deflateCopy ();
>  int
> -main()
> +main ()
>  {
> -  {
> -    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
> -    char *string = " +69";
> -    char *term;
> -    double value;
> -    value = strtod (string, &term);
> -    if (value != 69 || term != (string + 4))
> -      return 1;
> -  }
> -
> -  {
> -    /* Under Solaris 2.4, strtod returns the wrong value for the
> -       terminating character under some conditions.  */
> -    char *string = "NaN";
> -    char *term;
> -    strtod (string, &term);
> -    if (term != string && *(term - 1) == 0)
> -      return 1;
> -  }
> +return deflateCopy ();
> +  ;
>    return 0;
>  }
> -
>  _ACEOF
> -if ac_fn_c_try_run "$LINENO"; then :
> -  ac_cv_func_strtod=yes
> +if ac_fn_c_try_link "$LINENO"; then :
> +  ac_cv_lib_z_deflateCopy=yes
>  else
> -  ac_cv_func_strtod=no
> -fi
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> -  conftest.$ac_objext conftest.beam conftest.$ac_ext
> +  ac_cv_lib_z_deflateCopy=no
>  fi
> -
> +rm -f core conftest.err conftest.$ac_objext \
> +    conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_check_lib_save_LIBS
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
> -$as_echo "$ac_cv_func_strtod" >&6; }
> -if test $ac_cv_func_strtod = no; then
> -  case " $LIBOBJS " in
> -  *" strtod.$ac_objext "* ) ;;
> -  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
> - ;;
> -esac
> +{ $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 :
> +  cat >>confdefs.h <<_ACEOF
> +#define HAVE_LIBZ 1
> +_ACEOF
> 
> -ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
> -if test "x$ac_cv_func_pow" = x""yes; then :
> +  LIBS="-lz $LIBS"
> 
> +else
> +  as_fn_error $? "Could not find zlib" "$LINENO" 5
>  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 :
> +{ $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 :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
> -LIBS="-lm  $LIBS"
> +LIBS="-liconv  $LIBS"
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
> 
> @@ -9528,55 +6553,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  #ifdef __cplusplus
>  extern "C"
>  #endif
> -char pow ();
> +char libiconv_open ();
>  int
>  main ()
>  {
> -return pow ();
> +return libiconv_open ();
>    ;
>    return 0;
>  }
>  _ACEOF
>  if ac_fn_c_try_link "$LINENO"; then :
> -  ac_cv_lib_m_pow=yes
> +  ac_cv_lib_iconv_libiconv_open=yes
>  else
> -  ac_cv_lib_m_pow=no
> +  ac_cv_lib_iconv_libiconv_open=no
>  fi
>  rm -f core conftest.err conftest.$ac_objext \
>      conftest$ac_exeext conftest.$ac_ext
>  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 :
> -  POW_LIB=-lm
> +{ $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 :
> +  libiconv="y"
>  else
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library 
> containing definition of pow" >&5
> -$as_echo "$as_me: WARNING: cannot find library containing definition of pow" 
> >&2;}
> -fi
> -
> +  libiconv="n"
>  fi
> 
> -fi
> 
> -for ac_func in  \
> -                alarm atexit bzero clock_gettime dup2 fdatasync ftruncate \
> -                getcwd gethostbyname gethostname getpagesize gettimeofday \
> -                inet_ntoa isascii localtime_r memchr memmove memset mkdir \
> -                mkfifo munmap pathconf realpath regcomp rmdir select setenv \
> -                socket strcasecmp strchr strcspn strdup strerror strndup \
> -                strpbrk strrchr strspn strstr strtol strtoul strtoull tzset \
> -                uname \
> 
> +# Checks for header files.
> +for ac_header in yajl/yajl_version.h
>  do :
> -  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
> -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
> -if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
> +  ac_fn_c_check_header_mongrel "$LINENO" "yajl/yajl_version.h" 
> "ac_cv_header_yajl_yajl_version_h" "$ac_includes_default"
> +if test "x$ac_cv_header_yajl_yajl_version_h" = x""yes; then :
>    cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
> +#define HAVE_YAJL_YAJL_VERSION_H 1
>  _ACEOF
> 
>  fi
> +
>  done
> 
> 
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 57c887d..deb848d 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -19,9 +19,6 @@ recommended, use PREPEND_INCLUDES, PREPEND_LIB, \
>  APPEND_INCLUDES and APPEND_LIB instead when possible.])
>  ])
> 
> -AC_USE_SYSTEM_EXTENSIONS
> -AC_CANONICAL_HOST
> -
>  # M4 Macro includes
>  m4_include([m4/savevar.m4])
>  m4_include([m4/features.m4])
> @@ -75,9 +72,7 @@ AC_ARG_VAR([BCC], [Path to bcc tool])
>  AC_ARG_VAR([IASL], [Path to iasl tool])
> 
>  # Checks for programs.
> -AC_PROG_SED
>  AC_PROG_CC
> -AC_PROG_LN_S
>  AC_PROG_MAKE_SET
>  AC_PROG_INSTALL
>  AC_PATH_PROG([BISON], [bison])
> @@ -137,7 +132,6 @@ AC_SUBST(libext2fs)
>  AC_CHECK_LIB([gcrypt], [gcry_md_hash_buffer], [libgcrypt="y"], 
> [libgcrypt="n"])
>  AC_SUBST(libgcrypt)
>  AX_CHECK_PTHREAD
> -AC_CHECK_LIB([rt], [clock_gettime])
>  AC_CHECK_LIB([yajl], [yajl_alloc], [],
>      [AC_MSG_ERROR([Could not find yajl])])
>  AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])
> @@ -145,58 +139,6 @@ AC_CHECK_LIB([iconv], [libiconv_open], [libiconv="y"], 
> [libiconv="n"])
>  AC_SUBST(libiconv)
> 
>  # Checks for header files.
> -AC_FUNC_ALLOCA
> -AC_CHECK_HEADERS([ \
> -                arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h \
> -                netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \
> -                strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \
> -                sys/socket.h sys/statvfs.h sys/time.h syslog.h termios.h \
> -                unistd.h yajl/yajl_version.h \
> -                ])
> -
> -# Checks for typedefs, structures, and compiler characteristics.
> -AC_HEADER_STDBOOL
> -AC_TYPE_UID_T
> -AC_C_INLINE
> -AC_TYPE_INT16_T
> -AC_TYPE_INT32_T
> -AC_TYPE_INT64_T
> -AC_TYPE_INT8_T
> -AC_TYPE_MODE_T
> -AC_TYPE_OFF_T
> -AC_TYPE_PID_T
> -AC_C_RESTRICT
> -AC_TYPE_SIZE_T
> -AC_TYPE_SSIZE_T
> -AC_CHECK_MEMBERS([struct stat.st_blksize])
> -AC_STRUCT_ST_BLOCKS
> -AC_CHECK_MEMBERS([struct stat.st_rdev])
> -AC_TYPE_UINT16_T
> -AC_TYPE_UINT32_T
> -AC_TYPE_UINT64_T
> -AC_TYPE_UINT8_T
> -AC_CHECK_TYPES([ptrdiff_t])
> -
> -# Checks for library functions.
> -AC_FUNC_ERROR_AT_LINE
> -AC_FUNC_FORK
> -AC_FUNC_FSEEKO
> -AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
> -AC_HEADER_MAJOR
> -AC_FUNC_MALLOC
> -AC_FUNC_MKTIME
> -AC_FUNC_MMAP
> -AC_FUNC_REALLOC
> -AC_FUNC_STRNLEN
> -AC_FUNC_STRTOD
> -AC_CHECK_FUNCS([ \
> -                alarm atexit bzero clock_gettime dup2 fdatasync ftruncate \
> -                getcwd gethostbyname gethostname getpagesize gettimeofday \
> -                inet_ntoa isascii localtime_r memchr memmove memset mkdir \
> -                mkfifo munmap pathconf realpath regcomp rmdir select setenv \
> -                socket strcasecmp strchr strcspn strdup strerror strndup \
> -                strpbrk strrchr strspn strstr strtol strtoul strtoull tzset \
> -                uname \
> -                ])
> +AC_CHECK_HEADERS([yajl/yajl_version.h])
> 
>  AC_OUTPUT()
> --
> 1.7.2.5
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.