remove configure patch

package/rtorrent/patches/patch-configure

@@ -1,1295 +0,0 @@
---- rtorrent-0.9.2.orig/configure	2012-04-20 09:00:08.000000000 +0200
-+++ rtorrent-0.9.2/configure	2014-01-13 12:54:25.000000000 +0100
-@@ -1,13 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for rtorrent 0.9.2.
-+# Generated by GNU Autoconf 2.69 for rtorrent 0.9.2.
- #
- # Report bugs to <jaris@ifi.uio.no>.
- #
- #
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -136,6 +134,31 @@ export LANGUAGE
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
-+# Use a proper internal environment variable to ensure we don't fall
-+  # into an infinite loop, continuously re-executing ourselves.
-+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-+    _as_can_reexec=no; export _as_can_reexec;
-+    # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+  *v*x* | *x*v* ) as_opts=-vx ;;
-+  *v* ) as_opts=-v ;;
-+  *x* ) as_opts=-x ;;
-+  * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+as_fn_exit 255
-+  fi
-+  # We don't want this to propagate to other subprocesses.
-+          { _as_can_reexec=; unset _as_can_reexec;}
- if test "x$CONFIG_SHELL" = x; then
-   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-   emulate sh
-@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test
- else
-   exitcode=1; echo positional parameters were not saved.
- fi
--test x\$exitcode = x0 || exit 1"
-+test x\$exitcode = x0 || exit 1
-+test -x / || exit 1"
-   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-@@ -222,21 +246,25 @@ IFS=$as_save_IFS
- 
- 
-       if test "x$CONFIG_SHELL" != x; then :
--  # We cannot yet assume a decent shell, so we have to provide a
--	# neutralization value for shells without unset; and this also
--	# works around shells that cannot unset nonexistent variables.
--	# Preserve -v and -x to the replacement shell.
--	BASH_ENV=/dev/null
--	ENV=/dev/null
--	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
--	export CONFIG_SHELL
--	case $- in # ((((
--	  *v*x* | *x*v* ) as_opts=-vx ;;
--	  *v* ) as_opts=-v ;;
--	  *x* ) as_opts=-x ;;
--	  * ) as_opts= ;;
--	esac
--	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-+  export CONFIG_SHELL
-+             # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+  *v*x* | *x*v* ) as_opts=-vx ;;
-+  *v* ) as_opts=-v ;;
-+  *x* ) as_opts=-x ;;
-+  * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+exit 255
- fi
- 
-     if test x$as_have_required = xno; then :
-@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
- 
- 
- } # as_fn_mkdir_p
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+  test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
- # as_fn_append VAR VALUE
- # ----------------------
- # Append the text in VALUE to the end of the definition contained in VAR. Take
-@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
-   chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+  # already done that, so ensure we don't try to do so again and fall
-+  # in an infinite loop.  This has already happened in practice.
-+  _as_can_reexec=no; export _as_can_reexec
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
-     # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
-+    # In both cases, we have to default to `cp -pR'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
-+      as_ln_s='cp -pR'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
--    as_ln_s='cp -p'
-+    as_ln_s='cp -pR'
-   fi
- else
--  as_ln_s='cp -p'
-+  as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -515,28 +555,8 @@ else
-   as_mkdir_p=false
- fi
- 
--if test -x / >/dev/null 2>&1; then
--  as_test_x='test -x'
--else
--  if ls -dL / >/dev/null 2>&1; then
--    as_ls_L_option=L
--  else
--    as_ls_L_option=
--  fi
--  as_test_x='
--    eval sh -c '\''
--      if test -d "$1"; then
--	test -d "$1/.";
--      else
--	case $1 in #(
--	-*)set "./$1";;
--	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--	???[sx]*):;;*)false;;esac;fi
--    '\'' sh
--  '
--fi
--as_executable_p=$as_test_x
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -683,9 +703,6 @@ CPPFLAGS
- LDFLAGS
- CXXFLAGS
- CXX
--CPPUNIT_LIBS
--CPPUNIT_CFLAGS
--CPPUNIT_CONFIG
- am__untar
- am__tar
- AMTAR
-@@ -750,8 +767,6 @@ SHELL'
- ac_subst_files=''
- ac_user_opts='
- enable_option_checking
--with_cppunit_prefix
--with_cppunit_exec_prefix
- enable_dependency_tracking
- enable_shared
- enable_static
-@@ -1253,8 +1268,6 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used" >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1418,8 +1431,10 @@ Optional Features:
-   --disable-option-checking  ignore unrecognized --enable/--with options
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --disable-dependency-tracking  speeds up one-time build
--  --enable-dependency-tracking   do not reject slow dependency extractors
-+  --enable-dependency-tracking
-+                          do not reject slow dependency extractors
-+  --disable-dependency-tracking
-+                          speeds up one-time build
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-static[=PKGS]  build static libraries [default=yes]
-   --enable-fast-install[=PKGS]
-@@ -1437,8 +1452,6 @@ Optional Features:
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
--  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
-   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-@@ -1548,9 +1561,9 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- rtorrent configure 0.9.2
--generated by GNU Autoconf 2.68
-+generated by GNU Autoconf 2.69
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1664,7 +1677,7 @@ $as_echo "$ac_try_echo"; } >&5
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
- 	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
-+	 test -x conftest$ac_exeext
-        }; then :
-   ac_retval=0
- else
-@@ -1924,7 +1937,7 @@ $as_echo "$ac_try_echo"; } >&5
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
- 	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
-+	 test -x conftest$ac_exeext
-        }; then :
-   ac_retval=0
- else
-@@ -2038,7 +2051,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by rtorrent $as_me 0.9.2, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2390,7 +2403,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- $as_echo "#define API_VERSION 6" >>confdefs.h
- 
- 
--am__api_version='1.11'
-+am__api_version='1.12'
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-@@ -2458,7 +2471,7 @@ case $as_dir/ in #((
-     # 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 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- 	  if test $ac_prog = install &&
- 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
-@@ -2516,9 +2529,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
- $as_echo_n "checking whether build environment is sane... " >&6; }
--# Just in case
--sleep 1
--echo timestamp > conftest.file
- # Reject unsafe characters in $srcdir or the absolute working directory
- # name.  Accept space and tab only in the latter.
- am_lf='
-@@ -2529,32 +2539,40 @@ case `pwd` in
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
- esac
- 
--# Do `set' in a subshell so we don't clobber the current shell's
-+# Do 'set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
--   if test "$*" = "X"; then
--      # -L didn't work.
--      set X `ls -t "$srcdir/configure" conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$*" != "X $srcdir/configure conftest.file" \
--      && test "$*" != "X conftest.file $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" "$LINENO" 5
--   fi
-+   am_has_slept=no
-+   for am_try in 1 2; do
-+     echo "timestamp, slept: $am_has_slept" > conftest.file
-+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+     if test "$*" = "X"; then
-+	# -L didn't work.
-+	set X `ls -t "$srcdir/configure" conftest.file`
-+     fi
-+     if test "$*" != "X $srcdir/configure conftest.file" \
-+	&& test "$*" != "X conftest.file $srcdir/configure"; then
- 
-+	# If neither matched, then we have a broken ls.  This can happen
-+	# if, for instance, CONFIG_SHELL is bash and it inherits a
-+	# broken ls alias from the environment.  This has actually
-+	# happened.  Such a system could not be considered "sane".
-+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-+  alias in your environment" "$LINENO" 5
-+     fi
-+     if test "$2" = conftest.file || test $am_try -eq 2; then
-+       break
-+     fi
-+     # Just in case.
-+     sleep 1
-+     am_has_slept=yes
-+   done
-    test "$2" = conftest.file
-    )
- then
-@@ -2566,6 +2584,16 @@ Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-+# If we didn't sleep, we still need to ensure time stamps of config.status and
-+# generated files are strictly newer.
-+am_sleep_pid=
-+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-+  ( sleep 1 ) &
-+  am_sleep_pid=$!
-+fi
-+
-+rm -f conftest.file
-+
- test "$program_prefix" != NONE &&
-   program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
-@@ -2592,8 +2620,8 @@ if eval "$MISSING --run true"; then
-   am_missing_run="$MISSING --run "
- else
-   am_missing_run=
--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
--$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
- fi
- 
- if test x"${install_sh}" != xset; then
-@@ -2605,10 +2633,10 @@ if test x"${install_sh}" != xset; then
-   esac
- fi
- 
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
-+# Installed binaries are usually stripped using 'strip' when the user
-+# run "make install-strip".  However 'strip' might not be the right
- # tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
-+# will honor the 'STRIP' environment variable to overrule this program.
- if test "$cross_compiling" != no; then
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-@@ -2627,7 +2655,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2667,7 +2695,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2718,7 +2746,7 @@ do
-   test -z "$as_dir" && as_dir=.
-     for ac_prog in mkdir gmkdir; do
- 	 for ac_exec_ext in '' $ac_executable_extensions; do
--	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
- 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 	     'mkdir (GNU coreutils) '* | \
- 	     'mkdir (coreutils) '* | \
-@@ -2747,12 +2775,6 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
- $as_echo "$MKDIR_P" >&6; }
- 
--mkdir_p="$MKDIR_P"
--case $mkdir_p in
--  [\\/$]* | ?:[\\/]*) ;;
--  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--
- for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -2771,7 +2793,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_AWK="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2885,6 +2907,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
- 
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- 
-+# For better backward compatibility.  To be removed once Automake 1.9.x
-+# dies out for good.  For more background, see:
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-+mkdir_p='$(MKDIR_P)'
-+
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
- # Always define AMTAR for backward compatibility.  Yes, it's still used
-@@ -2899,147 +2927,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
- 
- ac_config_headers="$ac_config_headers config.h"
- 
--
--
--
--# Check whether --with-cppunit-prefix was given.
--if test "${with_cppunit_prefix+set}" = set; then :
--  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
--else
--  cppunit_config_prefix=""
--fi
--
--
--# Check whether --with-cppunit-exec-prefix was given.
--if test "${with_cppunit_exec_prefix+set}" = set; then :
--  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
--else
--  cppunit_config_exec_prefix=""
--fi
--
--
--  if test x$cppunit_config_exec_prefix != x ; then
--     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
--     if test x${CPPUNIT_CONFIG+set} != xset ; then
--        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
--     fi
--  fi
--  if test x$cppunit_config_prefix != x ; then
--     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
--     if test x${CPPUNIT_CONFIG+set} != xset ; then
--        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
--     fi
--  fi
--
--  # Extract the first word of "cppunit-config", so it can be a program name with args.
--set dummy cppunit-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 ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $CPPUNIT_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_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_CPPUNIT_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
--
--  test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
--  ;;
--esac
--fi
--CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
--if test -n "$CPPUNIT_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
--$as_echo "$CPPUNIT_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  cppunit_version_min=1.9.6
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
--$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
--  no_cppunit=""
--  if test "$CPPUNIT_CONFIG" = "no" ; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--    no_cppunit=yes
--  else
--    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
--    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
--    cppunit_version=`$CPPUNIT_CONFIG --version`
--
--    cppunit_major_version=`echo $cppunit_version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    cppunit_minor_version=`echo $cppunit_version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    cppunit_micro_version=`echo $cppunit_version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--
--    cppunit_major_min=`echo $cppunit_version_min | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    if test "x${cppunit_major_min}" = "x" ; then
--       cppunit_major_min=0
--    fi
--
--    cppunit_minor_min=`echo $cppunit_version_min | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    if test "x${cppunit_minor_min}" = "x" ; then
--       cppunit_minor_min=0
--    fi
--
--    cppunit_micro_min=`echo $cppunit_version_min | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--    if test "x${cppunit_micro_min}" = "x" ; then
--       cppunit_micro_min=0
--    fi
--
--    cppunit_version_proper=`expr \
--        $cppunit_major_version \> $cppunit_major_min \| \
--        $cppunit_major_version \= $cppunit_major_min \& \
--        $cppunit_minor_version \> $cppunit_minor_min \| \
--        $cppunit_major_version \= $cppunit_major_min \& \
--        $cppunit_minor_version \= $cppunit_minor_min \& \
--        $cppunit_micro_version \>= $cppunit_micro_min `
--
--    if test "$cppunit_version_proper" = "1" ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
--$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
--    else
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--      no_cppunit=yes
--    fi
--  fi
--
--  if test "x$no_cppunit" = x ; then
--     :
--  else
--     CPPUNIT_CFLAGS=""
--     CPPUNIT_LIBS=""
--     :
--  fi
--
--
--
--
-+AM_PATH_CPPUNIT(1.9.6)
- 
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -3069,7 +2957,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3113,7 +3001,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3566,7 +3454,7 @@ am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
-+# Ignore all kinds of additional output from 'make'.
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
-   am__include=include
-@@ -3622,8 +3510,8 @@ else
-   # We make a subdir and do the tests there.  Otherwise we can end up
-   # making bogus files that we don't know about and never remove.  For
-   # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
-+  # making a dummy file named 'D' -- because '-MD' means "put the output
-+  # in D".
-   rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -3658,16 +3546,16 @@ else
-     : > sub/conftest.c
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
-+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+      # Solaris 10 /bin/sh.
-+      echo '/* dummy */' > sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-     # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
-+    # handle '-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs.
-     am__obj=sub/conftest.${OBJEXT-o}
-     am__minus_obj="-o $am__obj"
-     case $depmode in
-@@ -3676,8 +3564,8 @@ else
-       test "$am__universal" = false || continue
-       ;;
-     nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
-+      # After this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested.
-       if test "x$enable_dependency_tracking" = xyes; then
- 	continue
-       else
-@@ -3685,7 +3573,7 @@ else
-       fi
-       ;;
-     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # This compiler won't grok '-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-       am__obj=conftest.${OBJEXT-o}
-@@ -3926,7 +3814,7 @@ 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 as_fn_executable_p "$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
-@@ -3966,7 +3854,7 @@ 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 as_fn_executable_p "$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
-@@ -4019,7 +3907,7 @@ 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 as_fn_executable_p "$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
-@@ -4060,7 +3948,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -4118,7 +4006,7 @@ 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 as_fn_executable_p "$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
-@@ -4162,7 +4050,7 @@ 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 as_fn_executable_p "$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
-@@ -4358,8 +4246,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+struct stat;
- /* 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);
-@@ -4455,8 +4342,8 @@ else
-   # We make a subdir and do the tests there.  Otherwise we can end up
-   # making bogus files that we don't know about and never remove.  For
-   # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
-+  # making a dummy file named 'D' -- because '-MD' means "put the output
-+  # in D".
-   rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -4491,16 +4378,16 @@ else
-     : > sub/conftest.c
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
-+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+      # Solaris 10 /bin/sh.
-+      echo '/* dummy */' > sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-     # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
-+    # handle '-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs.
-     am__obj=sub/conftest.${OBJEXT-o}
-     am__minus_obj="-o $am__obj"
-     case $depmode in
-@@ -4509,8 +4396,8 @@ else
-       test "$am__universal" = false || continue
-       ;;
-     nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
-+      # After this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested.
-       if test "x$enable_dependency_tracking" = xyes; then
- 	continue
-       else
-@@ -4518,7 +4405,7 @@ else
-       fi
-       ;;
-     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # This compiler won't grok '-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-       am__obj=conftest.${OBJEXT-o}
-@@ -4594,7 +4481,7 @@ do
-     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
-+      as_fn_executable_p "$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
-@@ -4670,7 +4557,7 @@ do
-     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
-+      as_fn_executable_p "$ac_path_GREP" || continue
- # Check for GNU ac_path_GREP and select it if it is found.
-   # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
-@@ -4736,7 +4623,7 @@ do
-     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
-+      as_fn_executable_p "$ac_path_EGREP" || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
-   # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
-@@ -4803,7 +4690,7 @@ do
-     for ac_prog in fgrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+      as_fn_executable_p "$ac_path_FGREP" || continue
- # Check for GNU ac_path_FGREP and select it if it is found.
-   # Check for GNU $ac_path_FGREP
- case `"$ac_path_FGREP" --version 2>&1` in
-@@ -5059,7 +4946,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5103,7 +4990,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5527,7 +5414,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5567,7 +5454,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5873,7 +5760,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5913,7 +5800,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6017,7 +5904,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6061,7 +5948,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_AR="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6186,7 +6073,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6226,7 +6113,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6285,7 +6172,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6325,7 +6212,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6974,7 +6861,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7014,7 +6901,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7094,7 +6981,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7134,7 +7021,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7186,7 +7073,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7226,7 +7113,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7278,7 +7165,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7318,7 +7205,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_LIPO="lipo"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7370,7 +7257,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7410,7 +7297,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_OTOOL="otool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7462,7 +7349,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7502,7 +7389,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_OTOOL64="otool64"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -9104,7 +8991,7 @@ $as_echo_n "checking whether the $compil
-   enable_shared_with_static_runtimes=no
-   export_dynamic_flag_spec=
-   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  hardcode_automatic=no
-+  hardcode_automatic=yes
-   hardcode_direct=no
-   hardcode_direct_absolute=no
-   hardcode_libdir_flag_spec=
-@@ -12136,7 +12023,7 @@ hardcode_libdir_flag_spec_CXX=
- hardcode_libdir_separator_CXX=
- hardcode_minus_L_CXX=no
- hardcode_shlibpath_var_CXX=unsupported
--hardcode_automatic_CXX=no
-+hardcode_automatic_CXX=yes
- inherit_rpath_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
-@@ -15665,42 +15552,8 @@ _ACEOF
- esac
- rm -rf conftest*
-   fi
--fi
--
- 
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for execinfo.h" >&5
--$as_echo_n "checking for execinfo.h... " >&6; }
--
--  if test "$cross_compiling" = yes; then :
--  { { $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 test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--      #include <execinfo.h>
--      int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--$as_echo "#define USE_EXECINFO 1" >>confdefs.h
--
--
--else
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
-@@ -16350,7 +16203,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ax_pthread_config="yes"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -16553,7 +16406,7 @@ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_PTHREAD_CC="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -17514,7 +17367,7 @@ 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 as_fn_executable_p "$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
-@@ -17557,7 +17410,7 @@ 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 as_fn_executable_p "$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
-@@ -18204,6 +18057,14 @@ LIBOBJS=$ac_libobjs
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-+$as_echo_n "checking that generated files are newer than configure... " >&6; }
-+   if test -n "$am_sleep_pid"; then
-+     # Hide warnings about reused PIDs.
-+     wait $am_sleep_pid 2>/dev/null
-+   fi
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-+$as_echo "done" >&6; }
-  if test -n "$EXEEXT"; then
-   am__EXEEXT_TRUE=
-   am__EXEEXT_FALSE='#'
-@@ -18522,16 +18383,16 @@ if (echo >conf$$.file) 2>/dev/null; then
-     # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
-+    # In both cases, we have to default to `cp -pR'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
-+      as_ln_s='cp -pR'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
--    as_ln_s='cp -p'
-+    as_ln_s='cp -pR'
-   fi
- else
--  as_ln_s='cp -p'
-+  as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -18591,28 +18452,16 @@ else
-   as_mkdir_p=false
- fi
- 
--if test -x / >/dev/null 2>&1; then
--  as_test_x='test -x'
--else
--  if ls -dL / >/dev/null 2>&1; then
--    as_ls_L_option=L
--  else
--    as_ls_L_option=
--  fi
--  as_test_x='
--    eval sh -c '\''
--      if test -d "$1"; then
--	test -d "$1/.";
--      else
--	case $1 in #(
--	-*)set "./$1";;
--	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--	???[sx]*):;;*)false;;esac;fi
--    '\'' sh
--  '
--fi
--as_executable_p=$as_test_x
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+  test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -18634,7 +18483,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by rtorrent $as_me 0.9.2, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -18700,10 +18549,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- rtorrent config.status 0.9.2
--configured by $0, generated by GNU Autoconf 2.68,
-+configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -18794,7 +18643,7 @@ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
--  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-   shift
-   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-   CONFIG_SHELL='$SHELL'
-@@ -19825,7 +19674,7 @@ $as_echo "$as_me: executing $ac_file com
-     # Strip MF so we end up with the name of the file.
-     mf=`echo "$mf" | sed -e 's/:.*$//'`
-     # Check whether this is an Automake generated Makefile or not.
--    # We used to match only the files named `Makefile.in', but
-+    # We used to match only the files named 'Makefile.in', but
-     # some people rename them; so instead we look at the file content.
-     # Grep'ing the first line is not enough: some people post-process
-     # each Makefile.in and add a new line on top of each file to say so.
-@@ -19859,21 +19708,19 @@ $as_echo X"$mf" |
-       continue
-     fi
-     # Extract the definition of DEPDIR, am__include, and am__quote
--    # from the Makefile without running `make'.
-+    # from the Makefile without running 'make'.
-     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-     test -z "$DEPDIR" && continue
-     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-     test -z "am__include" && continue
-     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--    # When using ansi2knr, U may be empty or an underscore; expand it
--    U=`sed -n 's/^U = //p' < "$mf"`
-     # Find all dependency output files, they are included files with
-     # $(DEPDIR) in their names.  We invoke sed twice because it is the
-     # simplest approach to changing $(DEPDIR) to its actual value in the
-     # expansion.
-     for file in `sed -n "
-       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-       # Make sure the directory exists.
-       test -f "$dirpart/$file" && continue
-       fdir=`$as_dirname -- "$file" ||