Imported Debian patch 1.6.0+dfsg-1

15 files changed, 1517 insertions, 15511 deletions

diff --git a/debian/patches/01_sword_c++.diff b/debian/patches/01_sword_c++.diff
deleted file mode 100644
index a00b9a3..0000000
--- a/debian/patches/01_sword_c++.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sword-1.5.9.orig/include/flatapi.h
-+++ sword-1.5.9/include/flatapi.h
-@@ -29,7 +29,7 @@
- 
- extern "C" {
- 
--#define SWHANDLE long
-+#define SWHANDLE intptr_t
- 
- 
- //-----------------------------------------------------------------
diff --git a/debian/patches/02_libver.diff b/debian/patches/02_libver.diff
index c161d1c..2a48dc0 100644
--- a/debian/patches/02_libver.diff
+++ b/debian/patches/02_libver.diff
@@ -1,28 +1,28 @@
-This patch changes the upsteam SO name to Debian/Ubuntu SO name.
+This patch changes the upstream SO name to Debian/Ubuntu SO name.
 
-Index: sword-1.5.11/lib/Makefile.am
+Index: main/lib/Makefile.am
 ===================================================================
---- sword-1.5.11.orig/lib/Makefile.am	2007-09-01 11:16:04.000000000 +0100
-+++ sword-1.5.11/lib/Makefile.am	2007-09-01 11:17:05.000000000 +0100
+--- main.orig/lib/Makefile.am	2009-05-25 10:23:38.000000000 -0700
++++ main/lib/Makefile.am	2009-05-25 10:41:16.000000000 -0700
 @@ -36,7 +36,7 @@
- endif
  
+ libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
  
 -libsword_la_LDFLAGS = -release $(VERSION)
-+libsword_la_LDFLAGS = -version-info 7
++libsword_la_LDFLAGS = -version-info 8
  
  include ../src/keys/Makefile.am
  include ../src/utilfuns/Makefile.am
-Index: sword-1.5.11/lib/Makefile.in
+Index: main/lib/Makefile.in
 ===================================================================
---- sword-1.5.11.orig/lib/Makefile.in	2007-09-01 11:16:04.000000000 +0100
-+++ sword-1.5.11/lib/Makefile.in	2007-09-01 11:18:27.000000000 +0100
-@@ -436,7 +436,7 @@
+--- main.orig/lib/Makefile.in	2009-05-25 10:23:38.000000000 -0700
++++ main/lib/Makefile.in	2009-05-25 10:41:37.000000000 -0700
+@@ -452,7 +452,7 @@
  #if WITHCURL
  @INSTALLMGR_TRUE@IMGRLIBADD = -lcurl $(CURL_LIBS)
  libsword_la_LIBADD = $(ICULIBADD) $(IMGRLIBADD) $(CLUCENE_LIBS)
 -libsword_la_LDFLAGS = -release $(VERSION)
-+libsword_la_LDFLAGS = -version-info 7
++libsword_la_LDFLAGS = -version-info 8
  keysdir = $(top_srcdir)/src/keys
  utilfunsdir = $(top_srcdir)/src/utilfuns
  @INTERNALFTPLIB_FALSE@ftpsrc = 
diff --git a/debian/patches/03_clucene.diff b/debian/patches/03_clucene.diff
deleted file mode 100644
index 1c8e4e6..0000000
--- a/debian/patches/03_clucene.diff
+++ /dev/null
@@ -1,13094 +0,0 @@
-Index: sword-1.5.9/aclocal.m4
-===================================================================
---- sword-1.5.9.orig/aclocal.m4	2006-09-21 10:53:39.000000000 +0100
-+++ sword-1.5.9/aclocal.m4	2006-11-23 11:32:55.000000000 +0000
-@@ -13,7 +13,7 @@
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 48 AC_PROG_LIBTOOL
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1397,18 +1397,6 @@
-   dynamic_linker=no
-   ;;
- 
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -1564,7 +1552,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -1578,27 +1566,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
--    if AC_TRY_EVAL(ac_compile); then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -1610,7 +1581,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -1619,7 +1590,7 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  dynamic_linker='NetBSD ld.elf_so'
-   ;;
- 
- netbsd*)
-@@ -2327,7 +2298,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-@@ -2381,11 +2352,11 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -3133,7 +3104,7 @@
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu | dragonfly*)
-+  freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3292,7 +3263,7 @@
-     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-     ;;
--  linux*)
-+  linux* | k*bsd*-gnu)
-     case $cc_basename in
-       KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -3394,7 +3365,7 @@
- 	;;
-     esac
-     ;;
--  netbsd*)
-+  netbsd* | netbsdelf*-gnu)
-     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-       wlarc=
-@@ -4659,7 +4630,7 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
--linux*)
-+linux* | k*bsd*-gnu)
-   if test "$host_cpu" = ia64; then
-     symcode='[[ABCDGIRSTW]]'
-     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -4932,7 +4903,7 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu | dragonfly*)
-+      freebsd* | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -4975,7 +4946,7 @@
- 	    ;;
- 	esac
- 	;;
--      linux*)
-+      linux* | k*bsd*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -5018,7 +4989,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
-@@ -5229,7 +5200,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       case $cc_basename in
-       icc* | ecc*)
- 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -5370,6 +5341,9 @@
-   cygwin* | mingw*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -5540,7 +5514,7 @@
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	tmp_addflag=
- 	case $cc_basename,$host_cpu in
-@@ -5566,12 +5540,13 @@
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -5901,7 +5876,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
-+    freebsd* | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6003,7 +5978,7 @@
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -7283,4 +7258,5 @@
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
-+m4_include([m4/acx_clucene.m4])
- m4_include([m4/cppunit.m4])
-Index: sword-1.5.9/configure
-===================================================================
---- sword-1.5.9.orig/configure	2006-09-21 10:53:51.000000000 +0100
-+++ sword-1.5.9/configure	2006-11-23 11:32:55.000000000 +0000
-@@ -1,11 +1,12 @@
- #! /bin/sh
- # From configure.ac Revision: 1.45 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for sword 1.5.9.
-+# Generated by GNU Autoconf 2.60a for sword 1.5.9.
- #
- # Report bugs to <sword-bugs@crosswire.org>.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -19,11 +20,35 @@
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -32,8 +57,43 @@
- fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -47,18 +107,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -66,157 +127,386 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
- fi
- 
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
-+  case $as_dir in
- 	 /*)
--	   if ("$as_dir/$as_base" -c '
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells that exist, to save several forks.
-+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+  break
-+fi
-+
-+fi
-+
-+      done
-+
-+      if test "x$CONFIG_SHELL" != x; then
-+  for as_var in BASH_ENV ENV
-+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+        done
-+        export CONFIG_SHELL
-+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+    if test $as_have_required = no; then
-+  echo This script requires a shell more modern than all the
-+      echo shells that I found on your system.  Please install a
-+      echo modern shell, or manually run the script under such a
-+      echo shell if you do have one.
-+      { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf@gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
-+  chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # 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 sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... 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'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -225,7 +515,19 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
- 
- # 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'"
-@@ -234,15 +536,6 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- 
- 
- # Check that we are running under the correct shell.
-@@ -398,29 +691,26 @@
- 
- tagnames=${tagnames+${tagnames},}F77
- 
-+exec 7<&0 </dev/null 6>&1
-+
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete.  It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME='sword'
- PACKAGE_TARNAME='sword'
-@@ -432,42 +722,224 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- #  include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- #  include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS HAVE_CPPUNIT_TRUE HAVE_CPPUNIT_FALSE PKG_CONFIG PKGDATA GENCCODE GENCMN GENRB ICU_CONFIG CURL_CONFIG with_zlib with_icu with_conf dir_confdef CURL_AM_CFLAGS CURL_LIBS LUCENE_LIBS ICU_LIBS ICU_IOLIBS ICU_VER XML_LIBS enable_debug enable_profile AM_CXXFLAGS target_system target_mingw32 MINGW_TRUE MINGW_FALSE ICU_TRUE ICU_FALSE USELUCENE_TRUE USELUCENE_FALSE ICUSWORD_TRUE ICUSWORD_FALSE ZLIB_TRUE ZLIB_FALSE INSTCONF_TRUE INSTCONF_FALSE INSTALLMGR_TRUE INSTALLMGR_FALSE WITHCURL_TRUE WITHCURL_FALSE INTERNALFTPLIB_TRUE INTERNALFTPLIB_FALSE CONFDEF_TRUE CONFDEF_FALSE USE_PKGCONF_TRUE USE_PKGCONF_FALSE BUILDTESTS_TRUE BUILDTESTS_FALSE BUILDUTILS_TRUE BUILDUTILS_FALSE BUILDEXAMPLES_TRUE BUILDEXAMPLES_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXDEPMODE
-+am__fastdepCXX_TRUE
-+am__fastdepCXX_FALSE
-+GREP
-+EGREP
-+LN_S
-+ECHO
-+AR
-+RANLIB
-+DLLTOOL
-+AS
-+OBJDUMP
-+CPP
-+CXXCPP
-+F77
-+FFLAGS
-+ac_ct_F77
-+LIBTOOL
-+CLUCENE_LIBS
-+CLUCENE_CXXFLAGS
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+CPPUNIT_CONFIG
-+CPPUNIT_CFLAGS
-+CPPUNIT_LIBS
-+HAVE_CPPUNIT_TRUE
-+HAVE_CPPUNIT_FALSE
-+PKG_CONFIG
-+PKGDATA
-+GENCCODE
-+GENCMN
-+GENRB
-+ICU_CONFIG
-+CURL_CONFIG
-+with_zlib
-+with_icu
-+with_conf
-+dir_confdef
-+CURL_AM_CFLAGS
-+CURL_LIBS
-+ICU_LIBS
-+ICU_IOLIBS
-+ICU_VER
-+XML_LIBS
-+enable_debug
-+enable_profile
-+AM_CXXFLAGS
-+target_system
-+target_mingw32
-+MINGW_TRUE
-+MINGW_FALSE
-+ICU_TRUE
-+ICU_FALSE
-+USELUCENE_TRUE
-+USELUCENE_FALSE
-+ICUSWORD_TRUE
-+ICUSWORD_FALSE
-+ZLIB_TRUE
-+ZLIB_FALSE
-+INSTCONF_TRUE
-+INSTCONF_FALSE
-+INSTALLMGR_TRUE
-+INSTALLMGR_FALSE
-+WITHCURL_TRUE
-+WITHCURL_FALSE
-+INTERNALFTPLIB_TRUE
-+INTERNALFTPLIB_FALSE
-+CONFDEF_TRUE
-+CONFDEF_FALSE
-+USE_PKGCONF_TRUE
-+USE_PKGCONF_FALSE
-+BUILDTESTS_TRUE
-+BUILDTESTS_FALSE
-+BUILDUTILS_TRUE
-+BUILDUTILS_FALSE
-+BUILDEXAMPLES_TRUE
-+BUILDEXAMPLES_FALSE
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+CXX
-+CXXFLAGS
-+CCC
-+CPP
-+CXXCPP
-+F77
-+FFLAGS'
-+
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -494,34 +966,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
- 
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
-   # If the previous option needs an argument, assign it.
-   if test -n "$ac_prev"; then
--    eval "$ac_prev=\$ac_option"
-+    eval $ac_prev=\$ac_option
-     ac_prev=
-     continue
-   fi
- 
--  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
- 
--  case $ac_option in
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
- 
-   -bindir | --bindir | --bindi | --bind | --bin | --bi)
-     ac_prev=bindir ;;
-@@ -543,12 +1029,18 @@
-   --config-cache | -C)
-     cache_file=config.cache ;;
- 
--  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+  -datadir | --datadir | --datadi | --datad)
-     ac_prev=datadir ;;
--  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
--  | --da=*)
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-     datadir=$ac_optarg ;;
- 
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-   -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-@@ -556,7 +1048,17 @@
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    eval "enable_$ac_feature=no" ;;
-+    eval enable_$ac_feature=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -565,11 +1067,7 @@
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "enable_$ac_feature='$ac_optarg'" ;;
-+    eval enable_$ac_feature=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -596,6 +1094,12 @@
-   -host=* | --host=* | --hos=* | --ho=*)
-     host_alias=$ac_optarg ;;
- 
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-   -includedir | --includedir | --includedi | --included | --include \
-   | --includ | --inclu | --incl | --inc)
-     ac_prev=includedir ;;
-@@ -620,13 +1124,16 @@
-   | --libexe=* | --libex=* | --libe=*)
-     libexecdir=$ac_optarg ;;
- 
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-   -localstatedir | --localstatedir | --localstatedi | --localstated \
--  | --localstate | --localstat | --localsta | --localst \
--  | --locals | --local | --loca | --loc | --lo)
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-     ac_prev=localstatedir ;;
-   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
--  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
--  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-     localstatedir=$ac_optarg ;;
- 
-   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -691,6 +1198,16 @@
-   | --progr-tra=* | --program-tr=* | --program-t=*)
-     program_transform_name=$ac_optarg ;;
- 
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
-@@ -747,11 +1264,7 @@
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "with_$ac_package='$ac_optarg'" ;;
-+    eval with_$ac_package=\$ac_optarg ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -760,7 +1273,7 @@
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package | sed 's/-/_/g'`
--    eval "with_$ac_package=no" ;;
-+    eval with_$ac_package=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -791,8 +1304,7 @@
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
--    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
--    eval "$ac_envvar='$ac_optarg'"
-+    eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-@@ -812,27 +1324,19 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
--  esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--	      localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
- do
--  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-   case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+   { (exit 1); exit 1; }; }
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -859,94 +1363,76 @@
- test "$silent" = yes && exec 6>/dev/null
- 
- 
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
--  # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$0" : 'X\(//\)[^/]' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   srcdir=$ac_confdir
--  if test ! -r $srcdir/$ac_unique_file; then
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-     srcdir=..
-   fi
- else
-   ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
--  if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
--  else
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
--  fi
- fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
--  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CXX_set=${CXX+set}
--ac_env_CXX_value=$CXX
--ac_cv_env_CXX_set=${CXX+set}
--ac_cv_env_CXX_value=$CXX
--ac_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_env_CXXFLAGS_value=$CXXFLAGS
--ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--ac_env_CXXCPP_set=${CXXCPP+set}
--ac_env_CXXCPP_value=$CXXCPP
--ac_cv_env_CXXCPP_set=${CXXCPP+set}
--ac_cv_env_CXXCPP_value=$CXXCPP
--ac_env_F77_set=${F77+set}
--ac_env_F77_value=$F77
--ac_cv_env_F77_set=${F77+set}
--ac_cv_env_F77_value=$F77
--ac_env_FFLAGS_set=${FFLAGS+set}
--ac_env_FFLAGS_value=$FFLAGS
--ac_cv_env_FFLAGS_set=${FFLAGS+set}
--ac_cv_env_FFLAGS_value=$FFLAGS
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
- 
- #
- # Report the --help message.
-@@ -975,9 +1461,6 @@
-   -n, --no-create         do not create output files
-       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
- 
--_ACEOF
--
--  cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
- 			  [$ac_default_prefix]
-@@ -995,15 +1478,22 @@
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --infodir=DIR          info documentation [PREFIX/info]
--  --mandir=DIR           man documentation [PREFIX/man]
-+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR          info documentation [DATAROOTDIR/info]
-+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR           man documentation [DATAROOTDIR/man]
-+  --docdir=DIR           documentation root [DATAROOTDIR/doc/sword]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1031,10 +1521,8 @@
-   --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-shared[=PKGS]
--                          build shared libraries [default=yes]
--  --enable-static[=PKGS]
--                          build static libraries [default=yes]
-+  --enable-shared[=PKGS]  build shared libraries [default=yes]
-+  --enable-static[=PKGS]  build static libraries [default=yes]
-   --enable-fast-install[=PKGS]
-                           optimize for fast installation [default=yes]
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-@@ -1053,14 +1541,14 @@
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
--  --with-tags[=TAGS]
--                          include additional configurations [automatic]
-+  --with-tags[=TAGS]      include additional configurations [automatic]
-+   --with-clucene=<path>  prefix of CLucene-Core installation. e.g. /usr/local
-+                          or /usr
-   --with-zlib             allow zlib compressed modules (default=yes)
-   --with-icu              use ICU for unicode (default=no)
-   --with-conf             install a new sword.conf (default=yes)
-   --with-curl             build install manager support using libcurl
-                           (default=yes)
--  --with-lucene           include lucene support for searching (default=no)
-   --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
-   --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
- 
-@@ -1069,8 +1557,8 @@
-   CFLAGS      C compiler flags
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CPP         C preprocessor
-@@ -1083,120 +1571,86 @@
- 
- Report bugs to <sword-bugs@crosswire.org>.
- _ACEOF
-+ac_status=$?
- fi
- 
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
--  ac_popdir=`pwd`
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d $ac_dir || continue
-+    test -d "$ac_dir" || continue
-     ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--    cd $ac_dir
--    # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_srcdir/configure.gnu; then
--      echo
--      $SHELL $ac_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_srcdir/configure; then
--      echo
--      $SHELL $ac_srcdir/configure  --help=recursive
--    elif test -f $ac_srcdir/configure.ac ||
--	   test -f $ac_srcdir/configure.in; then
--      echo
--      $ac_configure --help
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi
--    cd $ac_popdir
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-   done
- fi
- 
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
- sword configure 1.5.9
--generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.60a
- 
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
--  exit 0
-+  exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by sword $as_me 1.5.9, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60a.  Invocation command line was
- 
-   $ $0 $@
- 
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1215,7 +1669,7 @@
- /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
- /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
- /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
- /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
- /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1229,6 +1683,7 @@
-   test -z "$as_dir" && as_dir=.
-   echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
- 
- } >&5
- 
-@@ -1250,7 +1705,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1261,7 +1715,7 @@
-     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+    *\'*)
-       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-@@ -1283,9 +1737,7 @@
- 	  -* ) ac_must_keep_next=true ;;
- 	esac
-       fi
--      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--      # Get rid of the leading space.
--      ac_sep=" "
-+      ac_configure_args="$ac_configure_args '$ac_arg'"
-       ;;
-     esac
-   done
-@@ -1296,8 +1748,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
-   # Save into config.log some information that might help in debugging.
-   {
-@@ -1310,20 +1762,34 @@
- _ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-   (set) 2>&1 |
--    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       sed -n \
--	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
--      ;;
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-     *)
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--}
-+    esac |
-+    sort
-+)
-     echo
- 
-     cat <<\_ASBOX
-@@ -1334,22 +1800,28 @@
-     echo
-     for ac_var in $ac_subst_vars
-     do
--      eval ac_val=$`echo $ac_var`
--      echo "$ac_var='"'"'$ac_val'"'"'"
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-     if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
--	eval ac_val=$`echo $ac_var`
--	echo "$ac_var='"'"'$ac_val'"'"'"
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1361,26 +1833,24 @@
- ## ----------- ##
- _ASBOX
-       echo
--      sed "/^$/d" confdefs.h | sort
-+      cat confdefs.h
-       echo
-     fi
-     test "$ac_signal" != 0 &&
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core *.core &&
--  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
--     ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
- 
- # Predefined preprocessor variables.
- 
-@@ -1411,14 +1881,17 @@
- 
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
-   if test -r "$ac_site_file"; then
-     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1434,8 +1907,8 @@
-     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
--      [\\/]* | ?:[\\/]* ) . $cache_file;;
--      *)                      . ./$cache_file;;
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-     esac
-   fi
- else
-@@ -1447,12 +1920,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
--	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
--  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
--  eval ac_new_val="\$ac_env_${ac_var}_value"
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
-       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1477,8 +1949,7 @@
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -1495,12 +1966,6 @@
-    { (exit 1); exit 1; }; }
- 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
--
- 
- 
- 
-@@ -1525,6 +1990,11 @@
- 
- 
- 
-+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
- 
- 
- 
-@@ -1532,104 +2002,154 @@
- 
- 
- ac_aux_dir=
--for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
--  if test -f $ac_dir/install-sh; then
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+  if test -f "$ac_dir/install-sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install-sh -c"
-     break
--  elif test -f $ac_dir/install.sh; then
-+  elif test -f "$ac_dir/install.sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install.sh -c"
-     break
--  elif test -f $ac_dir/shtool; then
-+  elif test -f "$ac_dir/shtool"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/shtool install -c"
-     break
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
--echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
- 
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
--  ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+  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 &&
-   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+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
- 
- 
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
--  ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+  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` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
-+fi
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+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
- 
- 
--echo "$as_me:$LINENO: checking target system type" >&5
--echo $ECHO_N "checking target system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_target_alias=$target_alias
--test "x$ac_cv_target_alias" = "x" &&
--  ac_cv_target_alias=$ac_cv_host_alias
--ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-+  if test "x$target_alias" = x; then
-+  ac_cv_target=$ac_cv_host
-+else
-+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
-+fi
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_target" >&5
--echo "${ECHO_T}$ac_cv_target" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- target=$ac_cv_target
--target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
- 
- 
- # The aliases save the names the user supplied, while $host etc.
-@@ -1652,8 +2172,8 @@
- # 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.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1675,7 +2195,7 @@
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_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.
-@@ -1694,21 +2214,22 @@
-     ;;
- esac
- done
-+IFS=$as_save_IFS
- 
- 
- 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.  We don't cache a
--    # path for INSTALL within a source directory, because that will
-+    # 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 path is relative.
-+    # removed, or if the value is a relative name.
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1718,8 +2239,8 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1761,20 +2282,20 @@
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
--  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
--  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $.  echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+rm -f conftest.sed
- 
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1826,8 +2347,8 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1840,54 +2361,57 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$AWK" && break
- done
- 
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
--	@echo 'ac_maketemp="$(MAKE)"'
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
--else
--  eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+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
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   SET_MAKE=
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -1958,8 +2482,8 @@
-   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.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1972,32 +2496,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2010,27 +2536,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -2051,7 +2591,7 @@
- 
- 
- 
--          ac_config_headers="$ac_config_headers include/config.h"
-+ac_config_headers="$ac_config_headers include/config.h"
- 
- 
- 
-@@ -2060,7 +2600,7 @@
- # ---------------------------------------------------------------------
- CFLAGS=" $CFLAGS"
- CXXFLAGS=" $CXXFLAGS"
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -2074,8 +2614,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2088,32 +2628,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2126,36 +2668,51 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&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.
-+          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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2168,74 +2725,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
--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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2249,7 +2766,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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
-@@ -2260,6 +2777,7 @@
-   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.
-@@ -2277,22 +2795,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$CC"; then
-   if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
-+  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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2305,36 +2824,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CC" && break
-   done
- fi
- if test -z "$CC"; then
-   ac_ct_CC=$CC
--  for ac_prog in cl
-+  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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2347,29 +2868,45 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CC" && break
- done
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- fi
- 
- fi
-@@ -2382,21 +2919,35 @@
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -2421,47 +2972,77 @@
- # 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.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
--  (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort.  b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions.  Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link_default") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  # Find the output, starting from the most likely.  This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+  # 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 | *.o | *.obj )
--	;;
--    conftest.$ac_ext )
--	# This is the source file.
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
- 	# certainly right.
- 	break;;
-     *.* )
--	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	# FIXME: I believe we export ac_cv_exeext for Libtool,
--	# but it would be cool to find out if it's true.  Does anybody
--	# maintain Libtool? --akim.
--	export ac_cv_exeext
-+        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
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-@@ -2473,19 +3054,21 @@
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
- 
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -2504,22 +3087,27 @@
-     fi
-   fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-@@ -2530,9 +3118,8 @@
- 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 | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	  export ac_cv_exeext
- 	  break;;
-     * ) break;;
-   esac
-@@ -2546,14 +3133,14 @@
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2573,14 +3160,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+  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 ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
-@@ -2598,12 +3191,12 @@
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2626,24 +3219,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -2652,24 +3257,28 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2685,24 +3294,147 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -2711,12 +3443,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cc_g=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
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -2732,12 +3472,12 @@
-     CFLAGS=
-   fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_prog_cc_stdc=no
-+  ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2771,12 +3511,17 @@
- /* 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 -std1 is added to get
-+   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 -std1.  */
-+   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);};
-@@ -2791,213 +3536,82 @@
-   return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
-+  ac_cv_prog_cc_c89=$ac_arg
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
- 
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
--  x|xno)
--    echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-   *)
--    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
--fi
--
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- DEPDIR="${am__leading_dot}deps"
- 
--          ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
- 
- 
- am_make=${MAKE-make}
-@@ -3007,8 +3621,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -3035,15 +3649,15 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
- 
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
--  enableval="$enable_dependency_tracking"
-+  enableval=$enable_dependency_tracking;
-+fi
- 
--fi;
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-@@ -3063,8 +3677,8 @@
- 
- depcc="$CC"   am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3153,8 +3767,8 @@
- fi
- 
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
- 
-@@ -3170,18 +3784,22 @@
- fi
- 
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-   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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3194,36 +3812,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
-+  { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CXX" && break
-   done
- fi
- if test -z "$CXX"; then
-   ac_ct_CXX=$CXX
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3236,55 +3856,85 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CXX" && break
- done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
--  CXX=$ac_ct_CXX
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CXX=$ac_ct_CXX
-+  fi
- fi
- 
--
-+  fi
-+fi
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C++ compiler version" >&5
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3307,24 +3957,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3333,24 +3995,28 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
- GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--CXXFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3366,24 +4032,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3392,70 +4070,53 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cxx_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
--for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
-+	CXXFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3464,62 +4125,92 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
-+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  break
-+  ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
--ac_ext=cc
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -3527,8 +4218,8 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3617,8 +4308,8 @@
- fi
- 
- fi
--echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
- 
-@@ -3647,8 +4338,8 @@
- # 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.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3670,7 +4361,7 @@
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_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.
-@@ -3689,21 +4380,22 @@
-     ;;
- esac
- done
-+IFS=$as_save_IFS
- 
- 
- 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.  We don't cache a
--    # path for INSTALL within a source directory, because that will
-+    # 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 path is relative.
-+    # removed, or if the value is a relative name.
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -3715,10 +4407,9 @@
- 
- 
- 
--# Check whether --enable-shared or --disable-shared was given.
-+# Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
--  enableval="$enable_shared"
--  p=${PACKAGE-default}
-+  enableval=$enable_shared; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_shared=yes ;;
-     no) enable_shared=no ;;
-@@ -3737,12 +4428,12 @@
-     esac
- else
-   enable_shared=yes
--fi;
-+fi
-+
- 
--# Check whether --enable-static or --disable-static was given.
-+# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
--  enableval="$enable_static"
--  p=${PACKAGE-default}
-+  enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-     no) enable_static=no ;;
-@@ -3761,12 +4452,12 @@
-     esac
- else
-   enable_static=yes
--fi;
-+fi
-+
- 
--# Check whether --enable-fast-install or --disable-fast-install was given.
-+# Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
--  enableval="$enable_fast_install"
--  p=${PACKAGE-default}
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-     no) enable_fast_install=no ;;
-@@ -3785,10 +4476,11 @@
-     esac
- else
-   enable_fast_install=yes
--fi;
-+fi
-+
- 
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
- if test "${lt_cv_path_SED+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3841,37 +4533,184 @@
- fi
- 
- SED=$lt_cv_path_SED
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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_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
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    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
-+    ac_count=`expr $ac_count + 1`
-+    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
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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_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
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    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
-+    ac_count=`expr $ac_count + 1`
-+    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
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
- 
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -3900,11 +4739,11 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3937,17 +4776,17 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3961,20 +4800,20 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
--echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -3991,8 +4830,8 @@
-     ;;
- esac
- 
--echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4040,23 +4879,23 @@
-   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
- 
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4106,7 +4945,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-@@ -4160,11 +4999,11 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -4231,8 +5070,8 @@
- esac
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -4250,11 +5089,11 @@
- compiler=$CC
- 
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- # Some flags need to be propagated to the compiler or linker for good
-@@ -4281,7 +5120,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 4284 "configure"' > conftest.$ac_ext
-+  echo '#line 5123 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -4366,8 +5205,8 @@
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4393,24 +5232,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4419,9 +5270,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--lt_cv_cc_needs_belf=no
-+	lt_cv_cc_needs_belf=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -4430,8 +5282,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-     CFLAGS="$SAVE_CFLAGS"
-@@ -4461,8 +5313,8 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4475,32 +5327,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
--  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--echo "${ECHO_T}$DLLTOOL" >&6
-+  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+echo "${ECHO_T}$DLLTOOL" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_DLLTOOL"; then
-   ac_ct_DLLTOOL=$DLLTOOL
-   # Extract the first word of "dlltool", so it can be a program name with args.
- set dummy dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4513,27 +5367,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
- fi
- fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
--  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
--echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  DLLTOOL=$ac_ct_DLLTOOL
-+  if test "x$ac_ct_DLLTOOL" = x; then
-+    DLLTOOL="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DLLTOOL=$ac_ct_DLLTOOL
-+  fi
- else
-   DLLTOOL="$ac_cv_prog_DLLTOOL"
- fi
-@@ -4541,8 +5409,8 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4555,32 +5423,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AS="${ac_tool_prefix}as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
--  echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6
-+  { echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_AS"; then
-   ac_ct_AS=$AS
-   # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4593,27 +5463,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AS="as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
--  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  AS=$ac_ct_AS
-+  if test "x$ac_ct_AS" = x; then
-+    AS="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AS=$ac_ct_AS
-+  fi
- else
-   AS="$ac_cv_prog_AS"
- fi
-@@ -4621,8 +5505,8 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4635,32 +5519,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
--  echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6
-+  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_OBJDUMP"; then
-   ac_ct_OBJDUMP=$OBJDUMP
-   # Extract the first word of "objdump", so it can be a program name with args.
- set dummy objdump; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4673,27 +5559,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  OBJDUMP=$ac_ct_OBJDUMP
-+  if test "x$ac_ct_OBJDUMP" = x; then
-+    OBJDUMP="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OBJDUMP=$ac_ct_OBJDUMP
-+  fi
- else
-   OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
-@@ -4710,8 +5610,8 @@
- 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
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -4745,8 +5645,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -4771,9 +5676,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -4783,8 +5689,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -4811,6 +5722,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -4828,8 +5740,8 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -4852,8 +5764,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -4878,9 +5795,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -4890,8 +5808,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -4918,6 +5841,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -4940,8 +5864,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4965,24 +5889,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4991,9 +5927,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_stdc=no
-+	ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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.
-@@ -5049,6 +5986,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* 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))
-@@ -5068,18 +6006,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5092,12 +6039,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -5120,9 +6069,9 @@
- 		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -5136,24 +6085,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5162,12 +6123,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -5182,18 +6145,19 @@
- for ac_header in dlfcn.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5204,24 +6168,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5230,15 +6206,16 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5247,8 +6224,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5272,9 +6254,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5298,25 +6281,24 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
-+    ( cat <<\_ASBOX
- ## --------------------------------------- ##
- ## Report this to sword-bugs@crosswire.org ##
- ## --------------------------------------- ##
- _ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5333,13 +6315,13 @@
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-     (test "X$CXX" != "Xg++"))) ; then
--  ac_ext=cc
-+  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5369,8 +6351,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5395,9 +6382,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -5407,8 +6395,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5435,6 +6428,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -5452,8 +6446,8 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6
-+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -5476,8 +6470,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5502,9 +6501,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -5514,8 +6514,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5542,6 +6547,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -5557,7 +6563,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5571,12 +6577,12 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-   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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5589,36 +6595,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
--  echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
-+  { echo "$as_me:$LINENO: result: $F77" >&5
-+echo "${ECHO_T}$F77" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$F77" && break
-   done
- fi
- if test -z "$F77"; then
-   ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5631,48 +6639,78 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_F77="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
--  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_F77" && break
- done
- 
--  F77=$ac_ct_F77
-+  if test "x$ac_ct_F77" = x; then
-+    F77=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    F77=$ac_ct_F77
-+  fi
- fi
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:5661:" \
--     "checking for Fortran 77 compiler version" >&5
-+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -5682,8 +6720,8 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5696,24 +6734,36 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5722,20 +6772,21 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5746,24 +6797,36 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5772,13 +6835,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_f77_g=no
-+	ac_cv_prog_f77_g=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -5796,7 +6860,7 @@
- fi
- 
- G77=`test $ac_compiler_gnu = yes && echo yes`
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5807,8 +6871,8 @@
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- 
- # find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5916,19 +6980,19 @@
- fi
- 
- if test -n $lt_cv_sys_max_cmd_len ; then
--  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
--  echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
-+  { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
- 
- 
- 
- 
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5963,7 +7027,7 @@
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
--linux*)
-+linux* | k*bsd*-gnu)
-   if test "$host_cpu" = ia64; then
-     symcode='[ABCDGIRSTW]'
-     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -6132,15 +7196,15 @@
-   lt_cv_sys_global_symbol_to_cdecl=
- fi
- if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
--  echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
-+  { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
--  echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
-+  { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6154,8 +7218,8 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
- 
-@@ -6206,8 +7270,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6220,32 +7284,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AR="${ac_tool_prefix}ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+  { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_AR"; then
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6258,27 +7324,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AR="ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  AR=$ac_ct_AR
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
- else
-   AR="$ac_cv_prog_AR"
- fi
-@@ -6286,8 +7366,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6300,32 +7380,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_RANLIB"; then
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6338,27 +7420,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  RANLIB=$ac_ct_RANLIB
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
- else
-   RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -6366,8 +7462,8 @@
- 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.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6380,32 +7476,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6418,27 +7516,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -6497,8 +7609,8 @@
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6550,17 +7662,17 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-   if test -n "$ac_tool_prefix"; then
--    echo "$as_me:$LINENO: checking for file" >&5
--echo $ECHO_N "checking for file... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6612,11 +7724,11 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-   else
-@@ -6631,21 +7743,21 @@
- enable_dlopen=no
- enable_win32_dll=yes
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- 
--# Check whether --with-pic or --without-pic was given.
-+# Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
--  withval="$with_pic"
--  pic_mode="$withval"
-+  withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
--fi;
-+fi
-+
- test -z "$pic_mode" && pic_mode=default
- 
- # Use C for the default configuration in the libtool script
-@@ -6703,8 +7815,8 @@
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6721,11 +7833,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6724: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7836: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:6728: \$? = $ac_status" >&5
-+   echo "$as_me:7840: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -6738,8 +7850,8 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -6753,8 +7865,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -6883,7 +7995,7 @@
-       lt_prog_compiler_static='-Bstatic'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
-@@ -6963,16 +8075,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6989,11 +8101,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6992: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8104: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:6996: \$? = $ac_status" >&5
-+   echo "$as_me:8108: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7006,8 +8118,8 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
- 
- if test x"$lt_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -7034,8 +8146,8 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_static_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7062,8 +8174,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
- 
- if test x"$lt_prog_compiler_static_works" = xyes; then
-     :
-@@ -7072,8 +8184,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7093,11 +8205,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7096: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8208: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7100: \$? = $ac_status" >&5
-+   echo "$as_me:8212: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -7119,23 +8231,23 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -7145,8 +8257,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   runpath_var=
-   allow_undefined_flag=
-@@ -7322,7 +8434,7 @@
-       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	tmp_addflag=
- 	case $cc_basename,$host_cpu in
-@@ -7348,12 +8460,13 @@
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	link_all_deplibs=no
-       else
- 	ld_shlibs=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -7561,24 +8674,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7592,8 +8717,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -7622,24 +8749,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7653,8 +8792,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -7785,7 +8926,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
-+    freebsd* | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -7887,7 +9028,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -8103,8 +9244,8 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
- 
- #
-@@ -8124,8 +9265,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -8162,16 +9303,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--echo "${ECHO_T}$archive_cmds_need_lc" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -8377,18 +9518,6 @@
-   dynamic_linker=no
-   ;;
- 
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -8544,7 +9673,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -8558,31 +9687,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 8565 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -8594,7 +9702,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -8603,7 +9711,7 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  dynamic_linker='NetBSD ld.elf_so'
-   ;;
- 
- netbsd*)
-@@ -8779,8 +9887,8 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -8788,8 +9896,8 @@
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
-    test -n "$runpath_var" || \
-@@ -8813,8 +9921,8 @@
-   # directories.
-   hardcode_action=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink; then
-   # Fast installation is not supported
-@@ -8827,29 +9935,29 @@
- 
- striplib=
- old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
-    darwin*)
-        if test -n "$STRIP" ; then
-          striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-        else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-        ;;
-    *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     ;;
-   esac
- fi
-@@ -8881,8 +9989,8 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8895,40 +10003,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8937,14 +10057,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlopen=no
-+	ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-@@ -8958,8 +10079,8 @@
-    ;;
- 
-   *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8986,53 +10107,59 @@
- 
- #undef shl_load
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_load ();
- /* 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_shl_load) || defined (__stub___shl_load)
-+#if defined __stub_shl_load || defined __stub___shl_load
- choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != shl_load;
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -9041,18 +10168,19 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_shl_load=no
-+	ac_cv_func_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
-   lt_cv_dlopen="shl_load"
- else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9065,40 +10193,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_load ();
- int
- main ()
- {
--shl_load ();
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -9107,19 +10247,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dld_shl_load=no
-+	ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
- else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9146,53 +10287,59 @@
- 
- #undef dlopen
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- /* 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_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != dlopen;
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -9201,18 +10348,19 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_dlopen=no
-+	ac_cv_func_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
-   lt_cv_dlopen="dlopen"
- else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9225,40 +10373,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -9267,19 +10427,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlopen=no
-+	ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9292,40 +10453,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -9334,19 +10507,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_svld_dlopen=no
-+	ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9359,40 +10533,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dld_link ();
- int
- main ()
- {
--dld_link ();
-+return dld_link ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -9401,14 +10587,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dld_dld_link=no
-+	ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
- fi
-@@ -9448,8 +10635,8 @@
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9459,7 +10646,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9462 "configure"
-+#line 10649 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -9543,13 +10730,13 @@
- 
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9559,7 +10746,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9562 "configure"
-+#line 10749 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -9643,8 +10830,8 @@
- 
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -9666,13 +10853,13 @@
- 
- 
- # Report which library types will actually be built
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
- 
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -9692,15 +10879,15 @@
-   fi
-     ;;
- esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
- 
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -10183,7 +11370,7 @@
- fi
- 
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -10192,11 +11379,11 @@
- CC="$lt_save_CC"
- 
- 
--# Check whether --with-tags or --without-tags was given.
-+# Check whether --with-tags was given.
- if test "${with_tags+set}" = set; then
--  withval="$with_tags"
--  tagnames="$withval"
--fi;
-+  withval=$with_tags; tagnames="$withval"
-+fi
-+
- 
- if test -f "$ltmain" && test -n "$tagnames"; then
-   if test ! -f "${ofile}"; then
-@@ -10250,7 +11437,7 @@
- 	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- 	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- 	    (test "X$CXX" != "Xg++"))) ; then
--	  ac_ext=cc
-+	  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -10369,18 +11556,18 @@
-   # Set up default GNU C++ configuration
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -10409,11 +11596,11 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10446,17 +11633,17 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10470,8 +11657,8 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -10521,8 +11708,8 @@
- fi
- 
- # PORTME: fill in a description of your system's C++ link characteristics
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- ld_shlibs_CXX=yes
- case $host_os in
-   aix3*)
-@@ -10634,24 +11821,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10665,8 +11864,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -10696,24 +11897,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10727,8 +11940,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -10876,7 +12091,7 @@
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu | dragonfly*)
-+  freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -11035,7 +12250,7 @@
-     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-     hardcode_libdir_separator_CXX=:
-     ;;
--  linux*)
-+  linux* | k*bsd*-gnu)
-     case $cc_basename in
-       KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11137,7 +12352,7 @@
- 	;;
-     esac
-     ;;
--  netbsd*)
-+  netbsd* | netbsdelf*-gnu)
-     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-       wlarc=
-@@ -11459,8 +12674,8 @@
-     ld_shlibs_CXX=no
-     ;;
- esac
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- GCC_CXX="$GXX"
-@@ -11599,8 +12814,8 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -11704,7 +12919,7 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu | dragonfly*)
-+      freebsd* | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -11747,7 +12962,7 @@
- 	    ;;
- 	esac
- 	;;
--      linux*)
-+      linux* | k*bsd*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -11790,7 +13005,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
-@@ -11873,16 +13088,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11899,11 +13114,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:11902: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13117: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:11906: \$? = $ac_status" >&5
-+   echo "$as_me:13121: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -11916,8 +13131,8 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
- 
- if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-@@ -11944,8 +13159,8 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11972,8 +13187,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
- 
- if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-     :
-@@ -11982,8 +13197,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12003,11 +13218,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12006: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13221: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12010: \$? = $ac_status" >&5
-+   echo "$as_me:13225: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12029,23 +13244,23 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -12055,8 +13270,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
-@@ -12075,13 +13290,16 @@
-   cygwin* | mingw*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   esac
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- #
-@@ -12101,8 +13319,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -12139,16 +13357,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -12354,18 +13572,6 @@
-   dynamic_linker=no
-   ;;
- 
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -12521,7 +13727,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -12535,31 +13741,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 12542 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12571,7 +13756,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -12580,7 +13765,7 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  dynamic_linker='NetBSD ld.elf_so'
-   ;;
- 
- netbsd*)
-@@ -12756,8 +13941,8 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -12765,8 +13950,8 @@
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" || \
-    test -n "$runpath_var_CXX" || \
-@@ -12790,8 +13975,8 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink; then
-   # Fast installation is not supported
-@@ -13211,7 +14396,7 @@
- fi
- 
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -13316,13 +14501,13 @@
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
- 
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -13341,15 +14526,15 @@
-   fi
-   ;;
- esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
- 
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
- GCC_F77="$G77"
- LD_F77="$LD"
-@@ -13358,8 +14543,8 @@
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_F77='-Wl,'
-@@ -13488,7 +14673,7 @@
-       lt_prog_compiler_static_F77='-Bstatic'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
-@@ -13568,16 +14753,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13594,11 +14779,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13597: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14782: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:13601: \$? = $ac_status" >&5
-+   echo "$as_me:14786: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -13611,8 +14796,8 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
- 
- if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-     case $lt_prog_compiler_pic_F77 in
-@@ -13639,8 +14824,8 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13667,8 +14852,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
- 
- if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-     :
-@@ -13677,8 +14862,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13698,11 +14883,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13701: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14886: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:13705: \$? = $ac_status" >&5
-+   echo "$as_me:14890: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -13724,23 +14909,23 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -13750,8 +14935,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   runpath_var=
-   allow_undefined_flag_F77=
-@@ -13927,7 +15112,7 @@
-       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	tmp_addflag=
- 	case $cc_basename,$host_cpu in
-@@ -13953,12 +15138,13 @@
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	link_all_deplibs_F77=no
-       else
- 	ld_shlibs_F77=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -14156,24 +15342,36 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -14187,8 +15385,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -14207,24 +15407,36 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -14238,8 +15450,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -14370,7 +15584,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
-+    freebsd* | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -14472,7 +15686,7 @@
-       link_all_deplibs_F77=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -14688,8 +15902,8 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--echo "${ECHO_T}$ld_shlibs_F77" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
- test "$ld_shlibs_F77" = no && can_build_shared=no
- 
- #
-@@ -14709,8 +15923,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -14747,16 +15961,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -14962,18 +16176,6 @@
-   dynamic_linker=no
-   ;;
- 
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -15129,7 +16331,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -15143,31 +16345,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 15150 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15179,7 +16360,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -15188,7 +16369,7 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  dynamic_linker='NetBSD ld.elf_so'
-   ;;
- 
- netbsd*)
-@@ -15364,8 +16545,8 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -15373,8 +16554,8 @@
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_F77=
- if test -n "$hardcode_libdir_flag_spec_F77" || \
-    test -n "$runpath_var_F77" || \
-@@ -15398,8 +16579,8 @@
-   # directories.
-   hardcode_action_F77=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6; }
- 
- if test "$hardcode_action_F77" = relink; then
-   # Fast installation is not supported
-@@ -15819,7 +17000,7 @@
- fi
- 
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -15836,7 +17017,6 @@
- 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- 
- 
--
- # Source file extension for Java test sources.
- ac_ext=java
- 
-@@ -15904,8 +17084,8 @@
-   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15922,11 +17102,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15925: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17105: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15929: \$? = $ac_status" >&5
-+   echo "$as_me:17109: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -15939,8 +17119,8 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -15954,8 +17134,8 @@
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16084,7 +17264,7 @@
-       lt_prog_compiler_static_GCJ='-Bstatic'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       case $cc_basename in
-       icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16164,16 +17344,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16190,11 +17370,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17373: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16197: \$? = $ac_status" >&5
-+   echo "$as_me:17377: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16207,8 +17387,8 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
- 
- if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-     case $lt_prog_compiler_pic_GCJ in
-@@ -16235,8 +17415,8 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16263,8 +17443,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
- 
- if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-     :
-@@ -16273,8 +17453,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16294,11 +17474,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16297: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17477: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16301: \$? = $ac_status" >&5
-+   echo "$as_me:17481: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16320,23 +17500,23 @@
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16346,8 +17526,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   runpath_var=
-   allow_undefined_flag_GCJ=
-@@ -16523,7 +17703,7 @@
-       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    linux*)
-+    linux* | k*bsd*-gnu)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	tmp_addflag=
- 	case $cc_basename,$host_cpu in
-@@ -16549,12 +17729,13 @@
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	link_all_deplibs_GCJ=no
-       else
- 	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -16762,24 +17943,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -16793,8 +17986,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -16823,24 +18018,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -16854,8 +18061,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -16986,7 +18195,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
-+    freebsd* | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -17088,7 +18297,7 @@
-       link_all_deplibs_GCJ=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -17304,8 +18513,8 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
- 
- #
-@@ -17325,8 +18534,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -17363,16 +18572,16 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -17578,18 +18787,6 @@
-   dynamic_linker=no
-   ;;
- 
--kfreebsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -17745,7 +18942,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -17759,31 +18956,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 17766 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17795,7 +18971,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -17804,7 +18980,7 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  dynamic_linker='NetBSD ld.elf_so'
-   ;;
- 
- netbsd*)
-@@ -17980,8 +19156,8 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -17989,8 +19165,8 @@
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
- 
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-    test -n "$runpath_var_GCJ" || \
-@@ -18014,8 +19190,8 @@
-   # directories.
-   hardcode_action_GCJ=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
- 
- if test "$hardcode_action_GCJ" = relink; then
-   # Fast installation is not supported
-@@ -18435,7 +19611,7 @@
- fi
- 
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -18451,7 +19627,6 @@
-       RC)
- 
- 
--
- # Source file extension for RC test sources.
- ac_ext=rc
- 
-@@ -18916,7 +20091,7 @@
- fi
- 
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -18983,8 +20158,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19001,7 +20176,8 @@
- int
- main ()
- {
--#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-  bogus endian macros
- #endif
- 
-@@ -19010,24 +20186,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19053,24 +20241,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19079,14 +20279,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_c_bigendian=no
-+	ac_cv_c_bigendian=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--# It does not; compile a test program.
-+	# It does not; compile a test program.
- if test "$cross_compiling" = yes; then
-   # try to guess the endianness by grepping values into an object file
-   ac_cv_c_bigendian=unknown
-@@ -19096,11 +20297,11 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
- int
- main ()
-@@ -19111,24 +20312,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19147,8 +20360,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -19156,27 +20371,41 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+$ac_includes_default
- int
- main ()
- {
-+
-   /* Are we little or big endian?  From Harbison&Steele.  */
-   union
-   {
--    long l;
--    char c[sizeof (long)];
-+    long int l;
-+    char c[sizeof (long int)];
-   } u;
-   u.l = 1;
--  exit (u.c[sizeof (long) - 1] == 1);
-+  return u.c[sizeof (long int) - 1] == 1;
-+
-+  ;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19189,13 +20418,16 @@
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in
-   yes)
- 
-@@ -19214,33 +20446,121 @@
- esac
- 
- 
-+
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
-+# Ask user for path to clucene-core stuff:.
-+
-+# Check whether --with-clucene was given.
-+if test "${with_clucene+set}" = set; then
-+  withval=$with_clucene;
-+fi
-+
-+
-+#try some default locations
-+if test -z "$with_clucene"; then
-+	#use parent of this directory, and some common library paths
-+	with_clucene=$(cd "../" && pwd)
-+	with_clucene="$with_clucene /usr /usr/local"
-+else
-+	#use an absolute path
-+	with_clucene=$(cd "$with_clucene" && pwd)
-+fi
-+clucene_set_failed=
-+
-+{ echo "$as_me:$LINENO: checking how to include clucene" >&5
-+echo $ECHO_N "checking how to include clucene... $ECHO_C" >&6; }
-+CLUCENE_CXXFLAGS=
-+CLUCENE_LIBS=
-+for flag in $with_clucene; do
-+	if test -z "$clucene_set_failed"; then
-+		if test -e "$flag/include/CLucene/StdHeader.h"; then
-+			if test -e "$flag/lib/CLucene/clucene-config.h"; then
-+					CLUCENE_LIBS="-L$flag/lib -lclucene"
-+					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
-+					clucene_set_failed=$flag
-+			fi
-+		fi
-+	fi
-+
-+	if test -z "$clucene_set_failed"; then
-+		if test -e "$flag/src/CLucene/StdHeader.h"; then
-+			if test -e "$flag/src/libclucene.la"; then
-+				CLUCENE_LIBS="-L$flag/src/ -lclucene"
-+				CLUCENE_CXXFLAGS="-I$flag/src/"
-+				clucene_set_failed=$flag/src/
-+			fi
-+		fi
-+	fi
-+done
-+
-+if test -z "$clucene_set_failed"; then
-+	clucene_set_failed="true"
-+	{ echo "$as_me:$LINENO: result: \"failed\"" >&5
-+echo "${ECHO_T}\"failed\"" >&6; }
-+else
-+	{ echo "$as_me:$LINENO: result: $clucene_set_failed" >&5
-+echo "${ECHO_T}$clucene_set_failed" >&6; }
-+fi
-+
-+if test "$clucene_set_failed" = "true"; then
-+	{ { echo "$as_me:$LINENO: error: You must call configure with the --with-clucene option
-+		or you must compile this package from a subdirectory of the clucene core.
-+	    This tells configure where to find the CLucene Core library and headers.
-+	    e.g. --with-clucene=/usr/local or --with-clucene=/usr" >&5
-+echo "$as_me: error: You must call configure with the --with-clucene option
-+		or you must compile this package from a subdirectory of the clucene core.
-+	    This tells configure where to find the CLucene Core library and headers.
-+	    e.g. --with-clucene=/usr/local or --with-clucene=/usr" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+
-+
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
- # ---------------------------------------------------------------------
- # With options
- # ---------------------------------------------------------------------
- 
--# Check whether --with-zlib or --without-zlib was given.
-+# Check whether --with-zlib was given.
- if test "${with_zlib+set}" = set; then
--  withval="$with_zlib"
--
-+  withval=$with_zlib;
- else
-   with_zlib=yes
--fi;
-+fi
- 
--# Check whether --with-icu or --without-icu was given.
--if test "${with_icu+set}" = set; then
--  withval="$with_icu"
- 
-+# Check whether --with-icu was given.
-+if test "${with_icu+set}" = set; then
-+  withval=$with_icu;
- else
-   with_icu=no
--fi;
-+fi
- 
--# Check whether --with-conf or --without-conf was given.
--if test "${with_conf+set}" = set; then
--  withval="$with_conf"
- 
-+# Check whether --with-conf was given.
-+if test "${with_conf+set}" = set; then
-+  withval=$with_conf;
- else
-   with_conf=yes
--fi;
-+fi
-+
- #AC_ARG_WITH(installmgr,
- #	AC_HELP_STRING([--with-installmgr],[build install manager support:
- #	curl=using libcurl,
-@@ -19248,79 +20570,73 @@
- #	internal=using internal ftplib
- #	(default=internal)]),,with_installmgr=internal)
- 
--# Check whether --with-curl or --without-curl was given.
-+# Check whether --with-curl was given.
- if test "${with_curl+set}" = set; then
--  withval="$with_curl"
--
-+  withval=$with_curl;
- else
-   with_curl=yes
--fi;
--
--# Check whether --with-lucene or --without-lucene was given.
--if test "${with_lucene+set}" = set; then
--  withval="$with_lucene"
-+fi
- 
--else
--  with_lucene=no
--fi;
-+#AC_ARG_WITH(lucene,
-+#	AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
- 
- 
- # ---------------------------------------------------------------------
- # Enable options
- # ---------------------------------------------------------------------
--# Check whether --enable-debug or --disable-debug was given.
-+# Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
--  enableval="$enable_debug"
--
-+  enableval=$enable_debug;
- else
-   enable_debug=no
--fi;
--# Check whether --enable-profile or --disable-profile was given.
--if test "${enable_profile+set}" = set; then
--  enableval="$enable_profile"
-+fi
- 
-+# Check whether --enable-profile was given.
-+if test "${enable_profile+set}" = set; then
-+  enableval=$enable_profile;
- else
-   enable_profile=no
--fi;
--# Check whether --enable-profilefn or --disable-profilefn was given.
--if test "${enable_profilefn+set}" = set; then
--  enableval="$enable_profilefn"
-+fi
- 
-+# Check whether --enable-profilefn was given.
-+if test "${enable_profilefn+set}" = set; then
-+  enableval=$enable_profilefn;
- else
-   enable_profilefn=no
--fi;
--# Check whether --enable-tests or --disable-tests was given.
--if test "${enable_tests+set}" = set; then
--  enableval="$enable_tests"
-+fi
- 
-+# Check whether --enable-tests was given.
-+if test "${enable_tests+set}" = set; then
-+  enableval=$enable_tests;
- else
-   enable_tests=no
--fi;
--# Check whether --enable-utilities or --disable-utilities was given.
--if test "${enable_utilities+set}" = set; then
--  enableval="$enable_utilities"
-+fi
- 
-+# Check whether --enable-utilities was given.
-+if test "${enable_utilities+set}" = set; then
-+  enableval=$enable_utilities;
- else
-   enable_utilities=yes
--fi;
--# Check whether --enable-examples or --disable-examples was given.
--if test "${enable_examples+set}" = set; then
--  enableval="$enable_examples"
-+fi
- 
-+# Check whether --enable-examples was given.
-+if test "${enable_examples+set}" = set; then
-+  enableval=$enable_examples;
- else
-   enable_examples=no
--fi;
--echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
--    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+fi
-+
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+    # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
--  enableval="$enable_maintainer_mode"
--  USE_MAINTAINER_MODE=$enableval
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
-   USE_MAINTAINER_MODE=no
--fi;
--  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
- 
- 
- if test $USE_MAINTAINER_MODE = yes; then
-@@ -19340,8 +20656,8 @@
- # ---------------------------------------------------------------------
- if test x$with_zlib  = xyes; then
- 
--echo "$as_me:$LINENO: checking for compress in -lz" >&5
--echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for compress in -lz" >&5
-+echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z_compress+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19354,40 +20670,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char compress ();
- int
- main ()
- {
--compress ();
-+return compress ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19396,14 +20724,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_z_compress=no
-+	ac_cv_lib_z_compress=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
--echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; }
- if test $ac_cv_lib_z_compress = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBZ 1
-@@ -19426,21 +20755,21 @@
- 
- 
- 
--# Check whether --with-cppunit-prefix or --without-cppunit-prefix was given.
-+# Check whether --with-cppunit-prefix was given.
- if test "${with_cppunit_prefix+set}" = set; then
--  withval="$with_cppunit_prefix"
--  cppunit_config_prefix="$withval"
-+  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
- else
-   cppunit_config_prefix=""
--fi;
-+fi
- 
--# Check whether --with-cppunit-exec-prefix or --without-cppunit-exec-prefix was given.
-+
-+# 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"
-+  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
- else
-   cppunit_config_exec_prefix=""
--fi;
-+fi
-+
- 
-   if test x$cppunit_config_exec_prefix != x ; then
-      cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-@@ -19457,8 +20786,8 @@
- 
-   # Extract the first word of "cppunit-config", so it can be a program name with args.
- set dummy cppunit-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19473,32 +20802,33 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
--echo "${ECHO_T}$CPPUNIT_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
-+echo "${ECHO_T}$CPPUNIT_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   cppunit_version_min=1.8.0
- 
--  echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5
--echo $ECHO_N "checking for Cppunit - version >= $cppunit_version_min... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5
-+echo $ECHO_N "checking for Cppunit - version >= $cppunit_version_min... $ECHO_C" >&6; }
-   no_cppunit=""
-   if test "$CPPUNIT_CONFIG" = "no" ; then
-     no_cppunit=yes
-@@ -19530,11 +20860,11 @@
-         $cppunit_micro_version \>= $cppunit_micro_min `
- 
-     if test "$cppunit_version_proper" = "1" ; then
--      echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
--echo "${ECHO_T}$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6
-+      { echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
-+echo "${ECHO_T}$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
-     else
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-       no_cppunit=yes
-     fi
-   fi
-@@ -19571,8 +20901,8 @@
- use_pkgconfig=yes
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19587,28 +20917,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-   ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- if test x$PKG_CONFIG = xno ; then
-   { echo "$as_me:$LINENO: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&5
- echo "$as_me: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&2;}
-@@ -19637,8 +20968,8 @@
- if test x$with_icu = xyes; then
- 	# Extract the first word of "pkgdata", so it can be a program name with args.
- set dummy pkgdata; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKGDATA+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19654,32 +20985,33 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKGDATA="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKGDATA" && ac_cv_path_PKGDATA="/usr/sbin/pkgdata"
-   ;;
- esac
- fi
- PKGDATA=$ac_cv_path_PKGDATA
--
- if test -n "$PKGDATA"; then
--  echo "$as_me:$LINENO: result: $PKGDATA" >&5
--echo "${ECHO_T}$PKGDATA" >&6
-+  { echo "$as_me:$LINENO: result: $PKGDATA" >&5
-+echo "${ECHO_T}$PKGDATA" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- 	# Extract the first word of "genccode", so it can be a program name with args.
- set dummy genccode; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GENCCODE+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19695,32 +21027,33 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GENCCODE="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GENCCODE" && ac_cv_path_GENCCODE="/usr/sbin/genccode"
-   ;;
- esac
- fi
- GENCCODE=$ac_cv_path_GENCCODE
--
- if test -n "$GENCCODE"; then
--  echo "$as_me:$LINENO: result: $GENCCODE" >&5
--echo "${ECHO_T}$GENCCODE" >&6
-+  { echo "$as_me:$LINENO: result: $GENCCODE" >&5
-+echo "${ECHO_T}$GENCCODE" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- 	# Extract the first word of "gencmn", so it can be a program name with args.
- set dummy gencmn; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GENCMN+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19736,32 +21069,33 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GENCMN="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GENCMN" && ac_cv_path_GENCMN="/usr/sbin/gencmn"
-   ;;
- esac
- fi
- GENCMN=$ac_cv_path_GENCMN
--
- if test -n "$GENCMN"; then
--  echo "$as_me:$LINENO: result: $GENCMN" >&5
--echo "${ECHO_T}$GENCMN" >&6
-+  { echo "$as_me:$LINENO: result: $GENCMN" >&5
-+echo "${ECHO_T}$GENCMN" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- 	# Extract the first word of "genrb", so it can be a program name with args.
- set dummy genrb; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GENRB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19777,33 +21111,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GENRB="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GENRB" && ac_cv_path_GENRB="/usr/sbin/genrb"
-   ;;
- esac
- fi
- GENRB=$ac_cv_path_GENRB
--
- if test -n "$GENRB"; then
--  echo "$as_me:$LINENO: result: $GENRB" >&5
--echo "${ECHO_T}$GENRB" >&6
-+  { echo "$as_me:$LINENO: result: $GENRB" >&5
-+echo "${ECHO_T}$GENRB" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-+
- 	# Extract the first word of "icu-config", so it can be a program name with args.
- set dummy icu-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_ICU_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19818,28 +21153,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no"
-   ;;
- esac
- fi
- ICU_CONFIG=$ac_cv_path_ICU_CONFIG
--
- if test -n "$ICU_CONFIG"; then
--  echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5
--echo "${ECHO_T}$ICU_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5
-+echo "${ECHO_T}$ICU_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- # The icu-config script was new in icu 2.2
- 	if test "$ICU_CONFIG" = "no" ; then
- 	   echo "*** The icu-config script installed by icu could not be found"
-@@ -19903,8 +21239,8 @@
- if test x$with_curl = xyes; then
-     # Extract the first word of "curl-config", so it can be a program name with args.
- set dummy curl-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_CURL_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -19919,28 +21255,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no"
-   ;;
- esac
- fi
- CURL_CONFIG=$ac_cv_path_CURL_CONFIG
--
- if test -n "$CURL_CONFIG"; then
--  echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
--echo "${ECHO_T}$CURL_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
-+echo "${ECHO_T}$CURL_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     if test "$CURL_CONFIG" = "no" ; then
- 	echo "*** The curl-config script installed by curl could not be found"
- 	echo "*** compiling without libcurl support"
-@@ -19959,13 +21296,13 @@
- # ---------------------------------------------------------------------
- 
- #FIXME: always make lucene available without checking for lib and headers
--if test x$with_lucene = xyes; then
-+if test x$with_clucene = xyes; then
-    echo "lucene found - lucene searching options available"
--   LUCENE_AM_CFLAGS=""
--   LUCENE_LIBS="-lclucene"
--   AM_CXXFLAGS="$AM_CXXFLAGS -DUSELUCENE"
-+#   LUCENE_AM_CFLAGS=""
-+#   LUCENE_LIBS="-lclucene"
-+   AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE"
-    AM_CFLAGS="$AM_CFLAGS -DUSELUCENE"
--   LIBS="$LIBS $LUCENE_LIBS"
-+   LIBS="$LIBS $CLUCENE_LIBS"
- fi
- 
- 
-@@ -19990,7 +21327,7 @@
- 
- 
- 
--
-+#AC_SUBST(LUCENE_LIBS)
- 
- 
- 
-@@ -20033,7 +21370,7 @@
- 
- 
- 
--if test x$with_lucene = xyes; then
-+if test x$with_clucene = xyes; then
-   USELUCENE_TRUE=
-   USELUCENE_FALSE='#'
- else
-@@ -20160,7 +21497,7 @@
- # ---------------------------------------------------------------------
- # Final output
- # ---------------------------------------------------------------------
--                                                                                                              ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec"
-+ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -20180,39 +21517,58 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -20221,32 +21577,18 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- 
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[	 ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[	 ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
--  ac_i=`echo "$ac_i" |
--	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
--  # 2. Add them.
--  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
- 
-@@ -20417,11 +21759,35 @@
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -20430,8 +21796,43 @@
- fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -20445,18 +21846,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -20464,159 +21866,120 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
-+# CDPATH.
-+$as_unset CDPATH
- 
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # 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 sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... 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'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -20625,7 +21988,19 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
- 
- # 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'"
-@@ -20634,31 +22009,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
- 
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.  Logging --version etc. is OK.
--exec 5>>config.log
--{
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by sword $as_me 1.5.9, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60a.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -20666,30 +22024,20 @@
-   CONFIG_COMMANDS = $CONFIG_COMMANDS
-   $ $0 $@
- 
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
- 
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
- 
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -20697,7 +22045,7 @@
- Usage: $0 [OPTIONS] [FILE]...
- 
-   -h, --help       print this help, then exit
--  -V, --version    print version number, then exit
-+  -V, --version    print version number and configuration settings, then exit
-   -q, --quiet      do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
-@@ -20716,19 +22064,21 @@
- $config_commands
- 
- Report bugs to <bug-autoconf@gnu.org>."
--_ACEOF
- 
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- sword config.status 1.5.9
--configured by $0, generated by GNU Autoconf 2.59,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60a,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -20739,39 +22089,24 @@
- do
-   case $1 in
-   --*=*)
--    ac_option=`expr "x$1" : 'x\([^=]*\)='`
--    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
--  -*)
-+  *)
-     ac_option=$1
-     ac_optarg=$2
-     ac_shift=shift
-     ;;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_option=$1
--     ac_need_defaults=false;;
-   esac
- 
-   case $ac_option in
-   # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
-@@ -20781,18 +22116,24 @@
-     $ac_shift
-     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-     ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
--  *) ac_config_targets="$ac_config_targets $1" ;;
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
- 
-   esac
-   shift
-@@ -20808,47 +22149,59 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
--  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  CONFIG_SHELL=$SHELL
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
- 
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
- 
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
- _ACEOF
- 
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
--  case "$ac_config_target" in
--  # Handling of arguments.
--  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
--  "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
--  "tests/cppunit/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/cppunit/Makefile" ;;
--  "utilities/Makefile" ) CONFIG_FILES="$CONFIG_FILES utilities/Makefile" ;;
--  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
--  "examples/cmdline/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/cmdline/Makefile" ;;
--  "utilities/diatheke/Makefile" ) CONFIG_FILES="$CONFIG_FILES utilities/diatheke/Makefile" ;;
--  "icu/Makefile" ) CONFIG_FILES="$CONFIG_FILES icu/Makefile" ;;
--  "sword.pc" ) CONFIG_FILES="$CONFIG_FILES sword.pc" ;;
--  "sword.spec" ) CONFIG_FILES="$CONFIG_FILES sword.spec" ;;
--  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--  "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
-+  case $ac_config_target in
-+    "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-+    "tests/cppunit/Makefile") CONFIG_FILES="$CONFIG_FILES tests/cppunit/Makefile" ;;
-+    "utilities/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/Makefile" ;;
-+    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-+    "examples/cmdline/Makefile") CONFIG_FILES="$CONFIG_FILES examples/cmdline/Makefile" ;;
-+    "utilities/diatheke/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/diatheke/Makefile" ;;
-+    "icu/Makefile") CONFIG_FILES="$CONFIG_FILES icu/Makefile" ;;
-+    "sword.pc") CONFIG_FILES="$CONFIG_FILES sword.pc" ;;
-+    "sword.spec") CONFIG_FILES="$CONFIG_FILES sword.spec" ;;
-+
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
- 
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used.  Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -20860,669 +22213,655 @@
- fi
- 
- # Have a temporary directory for convenience.  Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
- 
- {
--  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
--  tmp=./confstat$$-$RANDOM
--  (umask 077 && mkdir $tmp)
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
- } ||
- {
-    echo "$me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
- 
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s,@SHELL@,$SHELL,;t t
--s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s,@exec_prefix@,$exec_prefix,;t t
--s,@prefix@,$prefix,;t t
--s,@program_transform_name@,$program_transform_name,;t t
--s,@bindir@,$bindir,;t t
--s,@sbindir@,$sbindir,;t t
--s,@libexecdir@,$libexecdir,;t t
--s,@datadir@,$datadir,;t t
--s,@sysconfdir@,$sysconfdir,;t t
--s,@sharedstatedir@,$sharedstatedir,;t t
--s,@localstatedir@,$localstatedir,;t t
--s,@libdir@,$libdir,;t t
--s,@includedir@,$includedir,;t t
--s,@oldincludedir@,$oldincludedir,;t t
--s,@infodir@,$infodir,;t t
--s,@mandir@,$mandir,;t t
--s,@build_alias@,$build_alias,;t t
--s,@host_alias@,$host_alias,;t t
--s,@target_alias@,$target_alias,;t t
--s,@DEFS@,$DEFS,;t t
--s,@ECHO_C@,$ECHO_C,;t t
--s,@ECHO_N@,$ECHO_N,;t t
--s,@ECHO_T@,$ECHO_T,;t t
--s,@LIBS@,$LIBS,;t t
--s,@build@,$build,;t t
--s,@build_cpu@,$build_cpu,;t t
--s,@build_vendor@,$build_vendor,;t t
--s,@build_os@,$build_os,;t t
--s,@host@,$host,;t t
--s,@host_cpu@,$host_cpu,;t t
--s,@host_vendor@,$host_vendor,;t t
--s,@host_os@,$host_os,;t t
--s,@target@,$target,;t t
--s,@target_cpu@,$target_cpu,;t t
--s,@target_vendor@,$target_vendor,;t t
--s,@target_os@,$target_os,;t t
--s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s,@INSTALL_DATA@,$INSTALL_DATA,;t t
--s,@CYGPATH_W@,$CYGPATH_W,;t t
--s,@PACKAGE@,$PACKAGE,;t t
--s,@VERSION@,$VERSION,;t t
--s,@ACLOCAL@,$ACLOCAL,;t t
--s,@AUTOCONF@,$AUTOCONF,;t t
--s,@AUTOMAKE@,$AUTOMAKE,;t t
--s,@AUTOHEADER@,$AUTOHEADER,;t t
--s,@MAKEINFO@,$MAKEINFO,;t t
--s,@install_sh@,$install_sh,;t t
--s,@STRIP@,$STRIP,;t t
--s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s,@mkdir_p@,$mkdir_p,;t t
--s,@AWK@,$AWK,;t t
--s,@SET_MAKE@,$SET_MAKE,;t t
--s,@am__leading_dot@,$am__leading_dot,;t t
--s,@AMTAR@,$AMTAR,;t t
--s,@am__tar@,$am__tar,;t t
--s,@am__untar@,$am__untar,;t t
--s,@CC@,$CC,;t t
--s,@CFLAGS@,$CFLAGS,;t t
--s,@LDFLAGS@,$LDFLAGS,;t t
--s,@CPPFLAGS@,$CPPFLAGS,;t t
--s,@ac_ct_CC@,$ac_ct_CC,;t t
--s,@EXEEXT@,$EXEEXT,;t t
--s,@OBJEXT@,$OBJEXT,;t t
--s,@DEPDIR@,$DEPDIR,;t t
--s,@am__include@,$am__include,;t t
--s,@am__quote@,$am__quote,;t t
--s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s,@CCDEPMODE@,$CCDEPMODE,;t t
--s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s,@CXX@,$CXX,;t t
--s,@CXXFLAGS@,$CXXFLAGS,;t t
--s,@ac_ct_CXX@,$ac_ct_CXX,;t t
--s,@CXXDEPMODE@,$CXXDEPMODE,;t t
--s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
--s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
--s,@EGREP@,$EGREP,;t t
--s,@LN_S@,$LN_S,;t t
--s,@ECHO@,$ECHO,;t t
--s,@AR@,$AR,;t t
--s,@ac_ct_AR@,$ac_ct_AR,;t t
--s,@RANLIB@,$RANLIB,;t t
--s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s,@DLLTOOL@,$DLLTOOL,;t t
--s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
--s,@AS@,$AS,;t t
--s,@ac_ct_AS@,$ac_ct_AS,;t t
--s,@OBJDUMP@,$OBJDUMP,;t t
--s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
--s,@CPP@,$CPP,;t t
--s,@CXXCPP@,$CXXCPP,;t t
--s,@F77@,$F77,;t t
--s,@FFLAGS@,$FFLAGS,;t t
--s,@ac_ct_F77@,$ac_ct_F77,;t t
--s,@LIBTOOL@,$LIBTOOL,;t t
--s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--s,@MAINT@,$MAINT,;t t
--s,@CPPUNIT_CONFIG@,$CPPUNIT_CONFIG,;t t
--s,@CPPUNIT_CFLAGS@,$CPPUNIT_CFLAGS,;t t
--s,@CPPUNIT_LIBS@,$CPPUNIT_LIBS,;t t
--s,@HAVE_CPPUNIT_TRUE@,$HAVE_CPPUNIT_TRUE,;t t
--s,@HAVE_CPPUNIT_FALSE@,$HAVE_CPPUNIT_FALSE,;t t
--s,@PKG_CONFIG@,$PKG_CONFIG,;t t
--s,@PKGDATA@,$PKGDATA,;t t
--s,@GENCCODE@,$GENCCODE,;t t
--s,@GENCMN@,$GENCMN,;t t
--s,@GENRB@,$GENRB,;t t
--s,@ICU_CONFIG@,$ICU_CONFIG,;t t
--s,@CURL_CONFIG@,$CURL_CONFIG,;t t
--s,@with_zlib@,$with_zlib,;t t
--s,@with_icu@,$with_icu,;t t
--s,@with_conf@,$with_conf,;t t
--s,@dir_confdef@,$dir_confdef,;t t
--s,@CURL_AM_CFLAGS@,$CURL_AM_CFLAGS,;t t
--s,@CURL_LIBS@,$CURL_LIBS,;t t
--s,@LUCENE_LIBS@,$LUCENE_LIBS,;t t
--s,@ICU_LIBS@,$ICU_LIBS,;t t
--s,@ICU_IOLIBS@,$ICU_IOLIBS,;t t
--s,@ICU_VER@,$ICU_VER,;t t
--s,@XML_LIBS@,$XML_LIBS,;t t
--s,@enable_debug@,$enable_debug,;t t
--s,@enable_profile@,$enable_profile,;t t
--s,@AM_CXXFLAGS@,$AM_CXXFLAGS,;t t
--s,@target_system@,$target_system,;t t
--s,@target_mingw32@,$target_mingw32,;t t
--s,@MINGW_TRUE@,$MINGW_TRUE,;t t
--s,@MINGW_FALSE@,$MINGW_FALSE,;t t
--s,@ICU_TRUE@,$ICU_TRUE,;t t
--s,@ICU_FALSE@,$ICU_FALSE,;t t
--s,@USELUCENE_TRUE@,$USELUCENE_TRUE,;t t
--s,@USELUCENE_FALSE@,$USELUCENE_FALSE,;t t
--s,@ICUSWORD_TRUE@,$ICUSWORD_TRUE,;t t
--s,@ICUSWORD_FALSE@,$ICUSWORD_FALSE,;t t
--s,@ZLIB_TRUE@,$ZLIB_TRUE,;t t
--s,@ZLIB_FALSE@,$ZLIB_FALSE,;t t
--s,@INSTCONF_TRUE@,$INSTCONF_TRUE,;t t
--s,@INSTCONF_FALSE@,$INSTCONF_FALSE,;t t
--s,@INSTALLMGR_TRUE@,$INSTALLMGR_TRUE,;t t
--s,@INSTALLMGR_FALSE@,$INSTALLMGR_FALSE,;t t
--s,@WITHCURL_TRUE@,$WITHCURL_TRUE,;t t
--s,@WITHCURL_FALSE@,$WITHCURL_FALSE,;t t
--s,@INTERNALFTPLIB_TRUE@,$INTERNALFTPLIB_TRUE,;t t
--s,@INTERNALFTPLIB_FALSE@,$INTERNALFTPLIB_FALSE,;t t
--s,@CONFDEF_TRUE@,$CONFDEF_TRUE,;t t
--s,@CONFDEF_FALSE@,$CONFDEF_FALSE,;t t
--s,@USE_PKGCONF_TRUE@,$USE_PKGCONF_TRUE,;t t
--s,@USE_PKGCONF_FALSE@,$USE_PKGCONF_FALSE,;t t
--s,@BUILDTESTS_TRUE@,$BUILDTESTS_TRUE,;t t
--s,@BUILDTESTS_FALSE@,$BUILDTESTS_FALSE,;t t
--s,@BUILDUTILS_TRUE@,$BUILDUTILS_TRUE,;t t
--s,@BUILDUTILS_FALSE@,$BUILDUTILS_FALSE,;t t
--s,@BUILDEXAMPLES_TRUE@,$BUILDEXAMPLES_TRUE,;t t
--s,@BUILDEXAMPLES_FALSE@,$BUILDEXAMPLES_FALSE,;t t
--s,@LIBOBJS@,$LIBOBJS,;t t
--s,@LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    else
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
--    else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--      else
--	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
--    fi
--  done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
-+CXXDEPMODE!$CXXDEPMODE$ac_delim
-+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+LN_S!$LN_S$ac_delim
-+ECHO!$ECHO$ac_delim
-+AR!$AR$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
--fi # test -n "$CONFIG_FILES"
-+done
- 
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+RANLIB!$RANLIB$ac_delim
-+DLLTOOL!$DLLTOOL$ac_delim
-+AS!$AS$ac_delim
-+OBJDUMP!$OBJDUMP$ac_delim
-+CPP!$CPP$ac_delim
-+CXXCPP!$CXXCPP$ac_delim
-+F77!$F77$ac_delim
-+FFLAGS!$FFLAGS$ac_delim
-+ac_ct_F77!$ac_ct_F77$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+CLUCENE_LIBS!$CLUCENE_LIBS$ac_delim
-+CLUCENE_CXXFLAGS!$CLUCENE_CXXFLAGS$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
-+CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
-+CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
-+HAVE_CPPUNIT_TRUE!$HAVE_CPPUNIT_TRUE$ac_delim
-+HAVE_CPPUNIT_FALSE!$HAVE_CPPUNIT_FALSE$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+PKGDATA!$PKGDATA$ac_delim
-+GENCCODE!$GENCCODE$ac_delim
-+GENCMN!$GENCMN$ac_delim
-+GENRB!$GENRB$ac_delim
-+ICU_CONFIG!$ICU_CONFIG$ac_delim
-+CURL_CONFIG!$CURL_CONFIG$ac_delim
-+with_zlib!$with_zlib$ac_delim
-+with_icu!$with_icu$ac_delim
-+with_conf!$with_conf$ac_delim
-+dir_confdef!$dir_confdef$ac_delim
-+CURL_AM_CFLAGS!$CURL_AM_CFLAGS$ac_delim
-+CURL_LIBS!$CURL_LIBS$ac_delim
-+ICU_LIBS!$ICU_LIBS$ac_delim
-+ICU_IOLIBS!$ICU_IOLIBS$ac_delim
-+ICU_VER!$ICU_VER$ac_delim
-+XML_LIBS!$XML_LIBS$ac_delim
-+enable_debug!$enable_debug$ac_delim
-+enable_profile!$enable_profile$ac_delim
-+AM_CXXFLAGS!$AM_CXXFLAGS$ac_delim
-+target_system!$target_system$ac_delim
-+target_mingw32!$target_mingw32$ac_delim
-+MINGW_TRUE!$MINGW_TRUE$ac_delim
-+MINGW_FALSE!$MINGW_FALSE$ac_delim
-+ICU_TRUE!$ICU_TRUE$ac_delim
-+ICU_FALSE!$ICU_FALSE$ac_delim
-+USELUCENE_TRUE!$USELUCENE_TRUE$ac_delim
-+USELUCENE_FALSE!$USELUCENE_FALSE$ac_delim
-+ICUSWORD_TRUE!$ICUSWORD_TRUE$ac_delim
-+ICUSWORD_FALSE!$ICUSWORD_FALSE$ac_delim
-+ZLIB_TRUE!$ZLIB_TRUE$ac_delim
-+ZLIB_FALSE!$ZLIB_FALSE$ac_delim
-+INSTCONF_TRUE!$INSTCONF_TRUE$ac_delim
-+INSTCONF_FALSE!$INSTCONF_FALSE$ac_delim
-+INSTALLMGR_TRUE!$INSTALLMGR_TRUE$ac_delim
-+INSTALLMGR_FALSE!$INSTALLMGR_FALSE$ac_delim
-+WITHCURL_TRUE!$WITHCURL_TRUE$ac_delim
-+WITHCURL_FALSE!$WITHCURL_FALSE$ac_delim
-+INTERNALFTPLIB_TRUE!$INTERNALFTPLIB_TRUE$ac_delim
-+INTERNALFTPLIB_FALSE!$INTERNALFTPLIB_FALSE$ac_delim
-+CONFDEF_TRUE!$CONFDEF_TRUE$ac_delim
-+CONFDEF_FALSE!$CONFDEF_FALSE$ac_delim
-+USE_PKGCONF_TRUE!$USE_PKGCONF_TRUE$ac_delim
-+USE_PKGCONF_FALSE!$USE_PKGCONF_FALSE$ac_delim
-+BUILDTESTS_TRUE!$BUILDTESTS_TRUE$ac_delim
-+BUILDTESTS_FALSE!$BUILDTESTS_FALSE$ac_delim
-+BUILDUTILS_TRUE!$BUILDUTILS_TRUE$ac_delim
-+BUILDUTILS_FALSE!$BUILDUTILS_FALSE$ac_delim
-+BUILDEXAMPLES_TRUE!$BUILDEXAMPLES_TRUE$ac_delim
-+BUILDEXAMPLES_FALSE!$BUILDEXAMPLES_FALSE$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+   { (exit 1); exit 1; }; };;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+   { (exit 1); exit 1; }; };;
-+      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
-+    done
- 
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  { as_dir="$ac_dir"
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-   ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
- 
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
- 
-   case $INSTALL in
-   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-   esac
-+_ACEOF
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--				     sed 's,.*/,,'` by configure."
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
- $extrasub
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s,@configure_input@,$configure_input,;t t
--s,@srcdir@,$ac_srcdir,;t t
--s,@abs_srcdir@,$ac_abs_srcdir,;t t
--s,@top_srcdir@,$ac_top_srcdir,;t t
--s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s,@builddir@,$ac_builddir,;t t
--s,@abs_builddir@,$ac_abs_builddir,;t t
--s,@top_builddir@,$ac_top_builddir,;t t
--s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
--s,@INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
- 
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
--ac_dB='[	 ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
--
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  rm -f "$tmp/stdin"
-   case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-   esac
--
--  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 # Do quote $f, to prevent DOS paths from being IFS'd.
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--  # Remove the trailing spaces.
--  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
--
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
- _ACEOF
- 
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h.  The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status.  Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless.  Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status.  If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless.  But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-+ac_dB='\\)[	 (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-+
-+uniq confdefs.h |
-+  sed -n '
-+	t rset
-+	:rset
-+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-+	t ok
-+	d
-+	:ok
-+	s/[\\&,]/\\&/g
-+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+  ' >>conftest.defines
- 
--# This sed command replaces #undef with comments.  This is necessary, for
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments.  This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[	 #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
- 
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
-+while :
- do
--  # Write a limited-size here document to $tmp/defines.sed.
--  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#define' lines.
--  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+  # Write a here document:
-+    cat >>$CONFIG_STATUS <<_ACEOF
-+    # First, check the format of the line:
-+    cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-+b
-+:def
-+_ACEOF
-+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-   echo 'CEOF
--  sed -f $tmp/defines.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+  grep . conftest.tail >/dev/null || break
-   rm -f conftest.defines
-   mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo '  fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
--  # Write a limited-size here document to $tmp/undefs.sed.
--  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#undef'
--  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--  rm -f conftest.undefs
--  mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
- 
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    echo "/* Generated by configure.  */" >$tmp/config.h
--  else
--    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
--  fi
--  cat $tmp/in >>$tmp/config.h
--  rm -f $tmp/in
-   if test x"$ac_file" != x-; then
--    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+    echo "/* $configure_input  */" >"$tmp/config.h"
-+    cat "$ac_result" >>"$tmp/config.h"
-+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_file" : 'X\(//\)[^/]' \| \
--	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--      { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
-       rm -f $ac_file
--      mv $tmp/config.h $ac_file
-+      mv "$tmp/config.h" $ac_file
-     fi
-   else
--    cat $tmp/config.h
--    rm -f $tmp/config.h
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-   fi
-+  rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-@@ -21533,135 +22872,39 @@
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X$ac_file : 'X\(//\)[^/]' \| \
- 	 X$ac_file : 'X\(//\)$' \| \
--	 X$ac_file : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
- echo X$ac_file |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`/stamp-h$_am_stamp_count
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
--  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
--  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
--  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_dest" : 'X\(//\)[^/]' \| \
--	 X"$ac_dest" : 'X\(//\)$' \| \
--	 X"$ac_dest" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
--  ac_builddir=.
--
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
--
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
- 
- 
--  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
--  case $ac_dest in
--    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-   # 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.
-@@ -21671,18 +22914,29 @@
-   # each Makefile.in and add a new line on top of each file to say so.
-   # So let's grep whole file.
-   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`(dirname "$mf") 2>/dev/null ||
-+    dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
--	 X"$mf" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   else
-     continue
-   fi
-@@ -21704,53 +22958,79 @@
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-     # Make sure the directory exists.
-     test -f "$dirpart/$file" && continue
--    fdir=`(dirname "$file") 2>/dev/null ||
-+    fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
--	 X"$file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    { if $as_mkdir_p; then
--    mkdir -p $dirpart/$fdir
--  else
--    as_dir=$dirpart/$fdir
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    { as_dir=$dirpart/$fdir
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
-   done
- done
-  ;;
-+
-   esac
--done
--_ACEOF
-+done # for ac_tag
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
- 
- { (exit 0); exit 0; }
- _ACEOF
-Index: sword-1.5.9/configure.ac
-===================================================================
---- sword-1.5.9.orig/configure.ac	2006-09-02 21:28:06.000000000 +0100
-+++ sword-1.5.9/configure.ac	2006-11-23 11:32:55.000000000 +0000
-@@ -30,6 +30,8 @@
- 
- AC_C_BIGENDIAN
- 
-+ACX_CLUCENE
-+
- # ---------------------------------------------------------------------
- # With options
- # ---------------------------------------------------------------------
-@@ -47,8 +49,8 @@
- #	(default=internal)]),,with_installmgr=internal)
- AC_ARG_WITH(curl,
- 	AC_HELP_STRING([--with-curl],[build install manager support using libcurl (default=yes)]),,with_curl=yes)
--AC_ARG_WITH(lucene,
--	AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
-+#AC_ARG_WITH(lucene,
-+#	AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
- 
- 
- # ---------------------------------------------------------------------
-@@ -203,13 +205,13 @@
- # ---------------------------------------------------------------------
- 
- #FIXME: always make lucene available without checking for lib and headers
--if test x$with_lucene = xyes; then
-+if test x$with_clucene = xyes; then
-    echo "lucene found - lucene searching options available"
--   LUCENE_AM_CFLAGS=""
--   LUCENE_LIBS="-lclucene"
--   AM_CXXFLAGS="$AM_CXXFLAGS -DUSELUCENE"
-+#   LUCENE_AM_CFLAGS=""
-+#   LUCENE_LIBS="-lclucene"
-+   AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE"
-    AM_CFLAGS="$AM_CFLAGS -DUSELUCENE"
--   LIBS="$LIBS $LUCENE_LIBS"
-+   LIBS="$LIBS $CLUCENE_LIBS"
- fi
- 
- 
-@@ -234,7 +236,7 @@
- AC_SUBST(CC)
- AC_SUBST(CURL_AM_CFLAGS)
- AC_SUBST(CURL_LIBS)
--AC_SUBST(LUCENE_LIBS)
-+#AC_SUBST(LUCENE_LIBS)
- AC_SUBST(ICU_LIBS)
- AC_SUBST(ICU_IOLIBS)
- AC_SUBST(ICU_VER)
-@@ -257,7 +259,7 @@
- # ---------------------------------------------------------------------
- AM_CONDITIONAL(MINGW, test x$target_mingw32 = xyes)
- AM_CONDITIONAL(ICU, test x$with_icu = xyes)
--AM_CONDITIONAL(USELUCENE, test x$with_lucene = xyes)
-+AM_CONDITIONAL(USELUCENE, test x$with_clucene = xyes)
- AM_CONDITIONAL(ICUSWORD, test x$with_icu = xsword)
- AM_CONDITIONAL(ZLIB, test x$with_zlib = xyes)
- AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes)
-Index: sword-1.5.9/m4/acx_clucene.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sword-1.5.9/m4/acx_clucene.m4	2006-11-23 11:32:55.000000000 +0000
-@@ -0,0 +1,70 @@
-+dnl CLucene detection m4
-+AC_DEFUN([ACX_CLUCENE], [
-+AC_LANG_SAVE
-+AC_LANG(C++)
-+
-+
-+# Ask user for path to clucene-core stuff:.
-+AC_ARG_WITH(clucene,
-+	AC_HELP_STRING([ --with-clucene=<path>],
-+		[prefix of CLucene-Core installation. e.g. /usr/local or /usr]),,)
-+
-+#try some default locations
-+if test -z "$with_clucene"; then
-+	#use parent of this directory, and some common library paths
-+	with_clucene=$(cd "../" && pwd)
-+	with_clucene="$with_clucene /usr /usr/local"
-+else
-+	#use an absolute path
-+	with_clucene=$(cd "$with_clucene" && pwd)
-+fi
-+clucene_set_failed=
-+
-+AC_MSG_CHECKING([how to include clucene])
-+CLUCENE_CXXFLAGS=
-+CLUCENE_LIBS=
-+for flag in $with_clucene; do
-+	if test -z "$clucene_set_failed"; then
-+		if test -e "$flag/include/CLucene/StdHeader.h"; then
-+			if test -e "$flag/lib/CLucene/clucene-config.h"; then
-+				if test -e "$flag/lib/libclucene.la"; then
-+					CLUCENE_LIBS="-L$flag/lib -lclucene"
-+					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
-+					clucene_set_failed=$flag
-+				fi
-+			fi
-+		fi
-+	fi
-+
-+	if test -z "$clucene_set_failed"; then
-+		if test -e "$flag/src/CLucene/StdHeader.h"; then
-+			if test -e "$flag/src/libclucene.la"; then
-+				CLUCENE_LIBS="-L$flag/src/ -lclucene"
-+				CLUCENE_CXXFLAGS="-I$flag/src/"
-+				clucene_set_failed=$flag/src/
-+			fi
-+		fi
-+	fi
-+done
-+
-+if test -z "$clucene_set_failed"; then
-+	clucene_set_failed="true"
-+	AC_MSG_RESULT("failed")
-+else
-+	AC_MSG_RESULT($clucene_set_failed)
-+fi
-+
-+if test "$clucene_set_failed" = "true"; then
-+	AC_MSG_ERROR([You must call configure with the --with-clucene option
-+		or you must compile this package from a subdirectory of the clucene core.
-+	    This tells configure where to find the CLucene Core library and headers.
-+	    e.g. --with-clucene=/usr/local or --with-clucene=/usr])
-+fi
-+AC_SUBST(CLUCENE_LIBS)
-+AC_SUBST(CLUCENE_CXXFLAGS)
-+
-+
-+
-+AC_LANG_RESTORE
-+])dnl ACX_CLUCENE
-+
-Index: sword-1.5.9/sword.pc.in
-===================================================================
---- sword-1.5.9.orig/sword.pc.in	2006-11-23 11:34:29.000000000 +0000
-+++ sword-1.5.9/sword.pc.in	2006-11-23 11:34:37.000000000 +0000
-@@ -7,6 +7,6 @@
- Name: SWORD
- Description: Biblical Text Engine
- Version: @VERSION@
--Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @LUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
-+Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
- Cflags: -I${includedir}/sword
- 
diff --git a/debian/patches/04_ziplock.diff b/debian/patches/04_ziplock.diff
deleted file mode 100644
index bc40ffa..0000000
--- a/debian/patches/04_ziplock.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: sword-1.5.9/src/modules/common/zverse.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/zverse.cpp	2005-11-20 06:06:40.000000000 +0000
-+++ sword-1.5.9/src/modules/common/zverse.cpp	2006-12-08 14:10:02.000000000 +0000
-@@ -257,13 +257,12 @@
- 
- void zVerse::zReadText(char testmt, long start, unsigned short size, SWBuf &inBuf) {
- 	inBuf = "";
--	inBuf.setFillByte(0);
--	inBuf.setSize(size+1);
--	if (size > 0) {
--		if (cacheBuf)
--			strncpy(inBuf.getRawData(), &(cacheBuf[start]), size);
-+	if ( (size > 0) && cacheBuf && ((unsigned)(start+size) <= strlen(cacheBuf)) ){ //TODO: optimize this, remove strlen
-+		inBuf.setFillByte(0);
-+		inBuf.setSize(size+1);
-+		strncpy(inBuf.getRawData(), &(cacheBuf[start]), size);
-+		inBuf.setSize(strlen(inBuf.c_str()));
- 	}
--	inBuf.setSize(strlen(inBuf.c_str()));
- }
- 
- 
-Index: sword-1.5.9/src/modules/common/zipcomprs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/zipcomprs.cpp	2003-06-27 02:41:08.000000000 +0100
-+++ sword-1.5.9/src/modules/common/zipcomprs.cpp	2006-12-08 13:14:15.000000000 +0000
-@@ -79,7 +79,7 @@
- 	if (len)
- 	{
- 		//printf("Doing compress\n");
--		if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len)!=Z_OK)
-+		if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK)
- 		{
- 			printf("ERROR in compression\n");
- 		}
-@@ -89,7 +89,7 @@
- 	}
- 	else
- 	{
--		fprintf(stderr, "No buffer to compress\n");
-+		fprintf(stderr, "ERROR: no buffer to compress\n");
- 	}
- 	delete [] zbuf;
- 	free (buf);
-@@ -144,15 +144,18 @@
- 		unsigned long blen = zlen*20;	// trust compression is less than 1000%
- 		char *buf = new char[blen]; 
- 		//printf("Doing decompress {%s}\n", zbuf);
--		if (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen) != Z_OK) {
--			fprintf(stderr, "no room in outbuffer to during decompression. see zipcomp.cpp\n");
-+		slen = 0;
-+		switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){
-+			case Z_OK: SendChars(buf, blen); slen = blen; break;
-+			case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break;
-+			case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break;
-+			case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break;
-+			default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break;
- 		}
--		SendChars(buf, blen);
- 		delete [] buf;
--		slen = blen;
- 	}
- 	else {
--		fprintf(stderr, "No buffer to decompress!\n");
-+		fprintf(stderr, "ERROR: no buffer to decompress!\n");
- 	}
- 	//printf("Finished decoding\n");
- 	free (zbuf);
-Index: sword-1.5.9/src/modules/common/entriesblk.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/entriesblk.cpp	2006-12-08 14:10:16.000000000 +0000
-+++ sword-1.5.9/src/modules/common/entriesblk.cpp	2006-12-08 14:10:38.000000000 +0000
-@@ -10,8 +10,13 @@
- 	// offset(4); size(4);
- 
- EntriesBlock::EntriesBlock(const char *iBlock, unsigned long size) {
--	block = (char *)calloc(1, size);
--	memcpy(block, iBlock, size);
-+	if (size) {
-+		block = (char *)calloc(1, size);
-+		memcpy(block, iBlock, size);
-+	}
-+	else {
-+		block = (char *)calloc(1, sizeof(__u32));
-+	}
- }
- 
- 
diff --git a/debian/patches/05_getline.diff b/debian/patches/05_getline.diff
deleted file mode 100644
index b31872f..0000000
--- a/debian/patches/05_getline.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sword-1.5.9/src/utilfuns/swbuf.cpp
-===================================================================
---- sword-1.5.9.orig/src/utilfuns/swbuf.cpp	2006-12-08 15:51:36.000000000 +0000
-+++ sword-1.5.9/src/utilfuns/swbuf.cpp	2006-12-08 15:52:19.000000000 +0000
-@@ -98,7 +98,7 @@
- 	if (max < 0)
- 		max = strlen(str);
- 	assureMore(max+1);
--	for (;((*str)&&(max));max--)
-+	for (;((max)&&(*str));max--)
- 		*end++ = *str++;
- 	*end = 0;
- }
diff --git a/debian/patches/06_warnings.diff b/debian/patches/06_warnings.diff
deleted file mode 100644
index e97d6d4..0000000
--- a/debian/patches/06_warnings.diff
+++ /dev/null
@@ -1,2009 +0,0 @@
-Index: sword-1.5.9/include/swmodule.h
-===================================================================
---- sword-1.5.9.orig/include/swmodule.h	2006-08-28 01:39:56.000000000 +0100
-+++ sword-1.5.9/include/swmodule.h	2006-11-24 17:13:59.000000000 +0000
-@@ -399,16 +399,16 @@
- 	 * @param path path where to create the new module
- 	 * @return error
- 	 */
--	static signed char createModule(const char *path) { return -1; }
-+	static signed char createModule(const char *) { return -1; }
- 
- 	/** Modify the current module entry text - only if module isWritable()
- 	 */
--	virtual void setEntry(const char *inbuf, long len = -1) { }
-+	virtual void setEntry(const char *, long = -1) { }
- 
- 	/** Link the current module entry to another module entry - only if
- 	 *	module isWritable()
- 	 */
--	virtual void linkEntry(const SWKey *sourceKey) { }
-+	virtual void linkEntry(const SWKey *) { }
- 
- 	/** Delete current module entry - only if module isWritable()
- 	 */
-Index: sword-1.5.9/include/swbuf.h
-===================================================================
---- sword-1.5.9.orig/include/swbuf.h	2006-08-28 09:14:40.000000000 +0100
-+++ sword-1.5.9/include/swbuf.h	2006-11-24 17:13:59.000000000 +0000
-@@ -338,7 +338,7 @@
- 	inline bool operator >=(const SWBuf &other) const { return compare(other) >= 0; }
- 
- 	inline bool startsWith(const char *prefix) const { return !strncmp(c_str(), prefix, strlen(prefix)); }
--	inline bool endsWith(const char *postfix) const { int psize = strlen(postfix); return (size() >= psize)?!strncmp(end-psize, postfix, psize):false; }
-+	inline bool endsWith(const char *postfix) const { unsigned long psize = strlen(postfix); return (size() >= psize)?!strncmp(end-psize, postfix, psize):false; }
- 	inline int compare(const char *other) const { return strcmp(c_str(), other); }
- 	inline bool operator ==(const char *other) const { return !compare(other); }
- 	inline bool operator !=(const char *other) const { return compare(other); }
-Index: sword-1.5.9/src/keys/listkey.cpp
-===================================================================
---- sword-1.5.9.orig/src/keys/listkey.cpp	2006-11-24 17:20:25.000000000 +0000
-+++ sword-1.5.9/src/keys/listkey.cpp	2006-11-24 17:20:48.000000000 +0000
-@@ -293,7 +293,6 @@
- 
- void ListKey::setText(const char *ikey) {
- 	// at least try to set the current element to this text
--	int pos = arraypos;
- 	for (arraypos = 0; arraypos < arraycnt; arraypos++) {
- 		SWKey *key = array[arraypos];
- 		if (key) {
-Index: sword-1.5.9/src/keys/treekeyidx.cpp
-===================================================================
---- sword-1.5.9.orig/src/keys/treekeyidx.cpp	2006-11-24 17:21:17.000000000 +0000
-+++ sword-1.5.9/src/keys/treekeyidx.cpp	2006-11-24 20:50:55.000000000 +0000
-@@ -159,11 +159,11 @@
- 
- bool TreeKeyIdx::previousSibling() {
- 	TreeNode iterator;
--	__u32 target = currentNode.offset;
-+	__s32 target = currentNode.offset;
- 	if (currentNode.parent > -1) {
- 		getTreeNodeFromIdxOffset(currentNode.parent, &iterator);
- 		getTreeNodeFromIdxOffset(iterator.firstChild, &iterator);
--		if (iterator.offset != target) {
-+		if (iterator.offset != currentNode.offset) {
- 			while ((iterator.next != target) && (iterator.next > -1))
- 				getTreeNodeFromIdxOffset(iterator.next, &iterator);
- 			if (iterator.next > -1) {
-Index: sword-1.5.9/src/keys/versekey.cpp
-===================================================================
---- sword-1.5.9.orig/src/keys/versekey.cpp	2006-11-24 20:51:27.000000000 +0000
-+++ sword-1.5.9/src/keys/versekey.cpp	2006-11-24 20:55:34.000000000 +0000
-@@ -329,7 +329,7 @@
- 
- int VerseKey::getBookAbbrev(const char *iabbr)
- {
--	int loop, diff, abLen, min, max, target, retVal = -1;
-+	int diff, abLen, min, max, target, retVal = -1;
- 
- 	char *abbr = 0;
- 
-@@ -417,7 +417,7 @@
- 	SWKey tmpDefaultKey = defaultKey;
- 	char lastPartial = 0;
- 	bool inTerm = true;
--	int notAllDigits;
-+	int notAllDigits = 0;
- 
- 	curkey.AutoNormalize(0);
- 	tmpListKey << tmpDefaultKey;
-@@ -1530,7 +1530,7 @@
- 
- const char *VerseKey::getOSISRef() const {
- 	static char buf[5][254];
--	static char loop = 0;
-+	static int loop = 0;
- 
- 	if (loop > 4)
- 		loop = 0;
-@@ -1541,7 +1541,7 @@
- 		sprintf(buf[loop], "%s.%d", osisbooks[Testament()-1][Book()-1], (int)Chapter());
- 	else if (Book())
- 		sprintf(buf[loop], "%s", osisbooks[Testament()-1][Book()-1]);
--	else	sprintf(buf[loop], "");
-+	else	buf[loop][0] = 0;
- 	return buf[loop++];
- }
- 
-Index: sword-1.5.9/src/utilfuns/ftpparse.c
-===================================================================
---- sword-1.5.9.orig/src/utilfuns/ftpparse.c	2006-11-24 22:50:00.000000000 +0000
-+++ sword-1.5.9/src/utilfuns/ftpparse.c	2006-11-24 22:51:53.000000000 +0000
-@@ -109,6 +109,7 @@
-     if (now - t < 350 * 86400)
-       return t;
-   }
-+  return 0;
- }
- 
- static int check(char *buf,char *monthname)
-@@ -145,10 +146,10 @@
-   int i;
-   int j;
-   int state;
--  long size;
-+  long size = 0;
-   long year;
--  long month;
--  long mday;
-+  long month = 0;
-+  long mday = 0;
-   long hour;
-   long minute;
- 
-Index: sword-1.5.9/src/utilfuns/swbuf.cpp
-===================================================================
---- sword-1.5.9.orig/src/utilfuns/swbuf.cpp	2006-11-24 20:55:56.000000000 +0000
-+++ sword-1.5.9/src/utilfuns/swbuf.cpp	2006-11-24 22:49:42.000000000 +0000
-@@ -108,7 +108,7 @@
- */
- void SWBuf::setSize(unsigned long len) {
- 	assureSize(len+1);
--	if ((end - buf) < len)
-+	if ((end - buf) < (signed)len)
- 		memset(end, fillByte, len - (end-buf));
- 	end = buf + len;
- 	*end = 0;
-Index: sword-1.5.9/src/utilfuns/url.cpp
-===================================================================
---- sword-1.5.9.orig/src/utilfuns/url.cpp	2006-11-24 22:52:02.000000000 +0000
-+++ sword-1.5.9/src/utilfuns/url.cpp	2006-11-24 22:52:13.000000000 +0000
-@@ -93,7 +93,6 @@
- 	 
- 	 //1. Init
- 	 const char* urlPtr = url.c_str();
--	 int pos = 0;
- 	 	 
- 	 protocol = "";
- 	 hostname = "";
-Index: sword-1.5.9/src/utilfuns/zlib/untgz.c
-===================================================================
---- sword-1.5.9.orig/src/utilfuns/zlib/untgz.c	2006-11-24 22:52:48.000000000 +0000
-+++ sword-1.5.9/src/utilfuns/zlib/untgz.c	2006-11-25 13:08:49.000000000 +0000
-@@ -1,8 +1,9 @@
- /*
-- * untgz.c -- Display contents and/or extract file from
-- * a gzip'd TAR file
-- * written by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-+ * untgz.c -- Display contents and extract files from a gzip'd TAR file
-+ *
-+ * written by Pedro A. Aranda Gutierrez <paag@tid.es>
-  * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
-+ * various fixes by Cosmin Truta <cosmint@cs.ubbcluj.ro>
-  */
- 
- #include <stdio.h>
-@@ -10,205 +11,318 @@
- #include <string.h>
- #include <time.h>
- #include <errno.h>
--#include <fcntl.h>
-+
-+#include "zlib.h"
-+
- #ifdef unix
--# include <unistd.h>
-+#  include <unistd.h>
-+#  include <sys/stat.h>
- #else
--# include <direct.h>
--# include <io.h>
-+#  include <direct.h>
-+#  include <io.h>
- #endif
- 
--#include "zlib.h"
--
- #ifdef WIN32
--# include <windows.h>
-+#include <windows.h>
- #  ifndef F_OK
--#    define F_OK (0)
-+#    define F_OK  0
- #  endif
-+#  define mkdir(dirname,mode)   _mkdir(dirname)
- #  ifdef _MSC_VER
--#    define mkdir(dirname,mode) _mkdir(dirname)
--#    define strdup(str)         _strdup(str)
--#    define unlink(fn)          _unlink(fn)
- #    define access(path,mode)   _access(path,mode)
--#  else
--#    define mkdir(dirname,mode) _mkdir(dirname)
-+#    define chmod(path,mode)    _chmod(path,mode)
-+#    define strdup(str)         _strdup(str)
- #  endif
- #else
- #  include <utime.h>
- #endif
- 
- 
--/* Values used in typeflag field.  */
-+/* values used in typeflag field */
-+
-+#define REGTYPE  '0'            /* regular file */
-+#define AREGTYPE '\0'           /* regular file */
-+#define LNKTYPE  '1'            /* link */
-+#define SYMTYPE  '2'            /* reserved */
-+#define CHRTYPE  '3'            /* character special */
-+#define BLKTYPE  '4'            /* block special */
-+#define DIRTYPE  '5'            /* directory */
-+#define FIFOTYPE '6'            /* FIFO special */
-+#define CONTTYPE '7'            /* reserved */
-+
-+/* GNU tar extensions */
-+
-+#define GNUTYPE_DUMPDIR  'D'    /* file names from dumped directory */
-+#define GNUTYPE_LONGLINK 'K'    /* long link name */
-+#define GNUTYPE_LONGNAME 'L'    /* long file name */
-+#define GNUTYPE_MULTIVOL 'M'    /* continuation of file from another volume */
-+#define GNUTYPE_NAMES    'N'    /* file name that does not fit into main hdr */
-+#define GNUTYPE_SPARSE   'S'    /* sparse file */
-+#define GNUTYPE_VOLHDR   'V'    /* tape/volume header */
- 
--#define REGTYPE	 '0'		/* regular file */
--#define AREGTYPE '\0'		/* regular file */
--#define LNKTYPE  '1'		/* link */
--#define SYMTYPE  '2'		/* reserved */
--#define CHRTYPE  '3'		/* character special */
--#define BLKTYPE  '4'		/* block special */
--#define DIRTYPE  '5'		/* directory */
--#define FIFOTYPE '6'		/* FIFO special */
--#define CONTTYPE '7'		/* reserved */
- 
--#define BLOCKSIZE 512
-+/* tar header */
-+
-+#define BLOCKSIZE     512
-+#define SHORTNAMESIZE 100
- 
- struct tar_header
--{				/* byte offset */
--  char name[100];		/*   0 */
--  char mode[8];			/* 100 */
--  char uid[8];			/* 108 */
--  char gid[8];			/* 116 */
--  char size[12];		/* 124 */
--  char mtime[12];		/* 136 */
--  char chksum[8];		/* 148 */
--  char typeflag;		/* 156 */
--  char linkname[100];		/* 157 */
--  char magic[6];		/* 257 */
--  char version[2];		/* 263 */
--  char uname[32];		/* 265 */
--  char gname[32];		/* 297 */
--  char devmajor[8];		/* 329 */
--  char devminor[8];		/* 337 */
--  char prefix[155];		/* 345 */
--				/* 500 */
-+{                               /* byte offset */
-+  char name[100];               /*   0 */
-+  char mode[8];                 /* 100 */
-+  char uid[8];                  /* 108 */
-+  char gid[8];                  /* 116 */
-+  char size[12];                /* 124 */
-+  char mtime[12];               /* 136 */
-+  char chksum[8];               /* 148 */
-+  char typeflag;                /* 156 */
-+  char linkname[100];           /* 157 */
-+  char magic[6];                /* 257 */
-+  char version[2];              /* 263 */
-+  char uname[32];               /* 265 */
-+  char gname[32];               /* 297 */
-+  char devmajor[8];             /* 329 */
-+  char devminor[8];             /* 337 */
-+  char prefix[155];             /* 345 */
-+                                /* 500 */
- };
- 
--union tar_buffer {
-+union tar_buffer
-+{
-   char               buffer[BLOCKSIZE];
-   struct tar_header  header;
- };
- 
--enum { TGZ_EXTRACT = 0, TGZ_LIST };
-+struct attr_item
-+{
-+  struct attr_item  *next;
-+  char              *fname;
-+  int                mode;
-+  time_t             time;
-+};
- 
--static char *TGZfname	OF((const char *));
--void TGZnotfound	OF((const char *));
-+enum { TGZ_EXTRACT, TGZ_LIST, TGZ_INVALID };
- 
--int getoct		OF((char *, int));
--char *strtime		OF((time_t *));
--int ExprMatch		OF((char *,char *));
-+char *TGZfname          OF((const char *));
-+void TGZnotfound        OF((const char *));
- 
--int makedir		OF((char *));
--int matchname		OF((int,int,char **,char *));
-+int getoct              OF((char *, int));
-+char *strtime           OF((time_t *));
-+int setfiletime         OF((char *, time_t));
-+void push_attr          OF((struct attr_item **, char *, int, time_t));
-+void restore_attr       OF((struct attr_item **));
- 
--void error		OF((const char *));
--int  tar		OF((gzFile, int, int, int, char **));
-+int ExprMatch           OF((char *, char *));
- 
--void help		OF((int));
--int main		OF((int, char **));
-+int makedir             OF((char *));
-+int matchname           OF((int, int, char **, char *));
- 
--char *prog;
-+void error              OF((const char *));
-+int tar                 OF((gzFile, int, const char *, int, int, char **));
- 
--/* This will give a benign warning */
-+void help               OF((int));
-+int main                OF((int, char **));
-+
-+char *prog;
- 
--static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", ".tar", NULL };
-+const char *TGZsuffix[] = { "\0", ".tar", ".tar.gz", ".taz", ".tgz", NULL };
- 
--/* Return the real name of the TGZ archive */
--/* or NULL if it does not exist. */
-+/* return the file name of the TGZ archive */
-+/* or NULL if it does not exist */
- 
--static char *TGZfname OF((const char *fname))
-+char *TGZfname (const char *arcname)
- {
-   static char buffer[1024];
-   int origlen,i;
--  
--  strcpy(buffer,fname);
-+
-+  strcpy(buffer,arcname);
-   origlen = strlen(buffer);
- 
--  for (i=0; TGZprefix[i]; i++)
-+  for (i=0; TGZsuffix[i]; i++)
-     {
--       strcpy(buffer+origlen,TGZprefix[i]);
-+       strcpy(buffer+origlen,TGZsuffix[i]);
-        if (access(buffer,F_OK) == 0)
-          return buffer;
-     }
-   return NULL;
- }
- 
-+
- /* error message for the filename */
- 
--void TGZnotfound OF((const char *fname))
-+void TGZnotfound (const char *arcname)
- {
-   int i;
- 
--  fprintf(stderr,"%s : couldn't find ",prog);
--  for (i=0;TGZprefix[i];i++)
--    fprintf(stderr,(TGZprefix[i+1]) ? "%s%s, " : "or %s%s\n",
--            fname,
--            TGZprefix[i]);
-+  fprintf(stderr,"%s: Couldn't find ",prog);
-+  for (i=0;TGZsuffix[i];i++)
-+    fprintf(stderr,(TGZsuffix[i+1]) ? "%s%s, " : "or %s%s\n",
-+            arcname,
-+            TGZsuffix[i]);
-   exit(1);
- }
- 
- 
--/* help functions */
-+/* convert octal digits to int */
-+/* on error return -1 */
- 
--int getoct(char *p,int width)
-+int getoct (char *p,int width)
- {
-   int result = 0;
-   char c;
--  
--  while (width --)
-+
-+  while (width--)
-     {
-       c = *p++;
--      if (c == ' ')
--	continue;
-       if (c == 0)
--	break;
-+        break;
-+      if (c == ' ')
-+        continue;
-+      if (c < '0' || c > '7')
-+        return -1;
-       result = result * 8 + (c - '0');
-     }
-   return result;
- }
- 
-+
-+/* convert time_t to string */
-+/* use the "YYYY/MM/DD hh:mm:ss" format */
-+
- char *strtime (time_t *t)
- {
-   struct tm   *local;
-   static char result[32];
- 
-   local = localtime(t);
--  sprintf(result,"%2d/%02d/%4d %02d:%02d:%02d",
--	  local->tm_mday, local->tm_mon+1, local->tm_year+1900,
--	  local->tm_hour, local->tm_min,   local->tm_sec);
-+  sprintf(result,"%4d/%02d/%02d %02d:%02d:%02d",
-+          local->tm_year+1900, local->tm_mon+1, local->tm_mday,
-+          local->tm_hour, local->tm_min, local->tm_sec);
-+  return result;
-+}
-+
-+
-+/* set file time */
-+
-+int setfiletime (char *fname,time_t ftime)
-+{
-+#ifdef WIN32
-+  static int isWinNT = -1;
-+  SYSTEMTIME st;
-+  FILETIME locft, modft;
-+  struct tm *loctm;
-+  HANDLE hFile;
-+  int result;
-+
-+  loctm = localtime(&ftime);
-+  if (loctm == NULL)
-+    return -1;
-+
-+  st.wYear         = (WORD)loctm->tm_year + 1900;
-+  st.wMonth        = (WORD)loctm->tm_mon + 1;
-+  st.wDayOfWeek    = (WORD)loctm->tm_wday;
-+  st.wDay          = (WORD)loctm->tm_mday;
-+  st.wHour         = (WORD)loctm->tm_hour;
-+  st.wMinute       = (WORD)loctm->tm_min;
-+  st.wSecond       = (WORD)loctm->tm_sec;
-+  st.wMilliseconds = 0;
-+  if (!SystemTimeToFileTime(&st, &locft) ||
-+      !LocalFileTimeToFileTime(&locft, &modft))
-+    return -1;
-+
-+  if (isWinNT < 0)
-+    isWinNT = (GetVersion() < 0x80000000) ? 1 : 0;
-+  hFile = CreateFile(fname, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
-+                     (isWinNT ? FILE_FLAG_BACKUP_SEMANTICS : 0),
-+                     NULL);
-+  if (hFile == INVALID_HANDLE_VALUE)
-+    return -1;
-+  result = SetFileTime(hFile, NULL, NULL, &modft) ? 0 : -1;
-+  CloseHandle(hFile);
-   return result;
-+#else
-+  struct utimbuf settime;
-+
-+  settime.actime = settime.modtime = ftime;
-+  return utime(fname,&settime);
-+#endif
-+}
-+
-+
-+/* push file attributes */
-+
-+void push_attr(struct attr_item **list,char *fname,int mode,time_t time)
-+{
-+  struct attr_item *item;
-+
-+  item = (struct attr_item *)malloc(sizeof(struct attr_item));
-+  if (item == NULL)
-+    error("Out of memory");
-+  item->fname = strdup(fname);
-+  item->mode  = mode;
-+  item->time  = time;
-+  item->next  = *list;
-+  *list       = item;
-+}
-+
-+
-+/* restore file attributes */
-+
-+void restore_attr(struct attr_item **list)
-+{
-+  struct attr_item *item, *prev;
-+
-+  for (item = *list; item != NULL; )
-+    {
-+      setfiletime(item->fname,item->time);
-+      chmod(item->fname,item->mode);
-+      prev = item;
-+      item = item->next;
-+      free(prev);
-+    }
-+  *list = NULL;
- }
- 
- 
--/* regular expression matching */
-+/* match regular expression */
- 
- #define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
- 
--int ExprMatch(char *string,char *expr)
-+int ExprMatch (char *string,char *expr)
- {
-   while (1)
-     {
-       if (ISSPECIAL(*expr))
--	{
--	  if (*expr == '/')
--	    {
--	      if (*string != '\\' && *string != '/')
--		return 0;
--	      string ++; expr++;
--	    }
--	  else if (*expr == '*')
--	    {
--	      if (*expr ++ == 0)
--		return 1;
--	      while (*++string != *expr)
--		if (*string == 0)
--		  return 0;
--	    }
--	}
-+        {
-+          if (*expr == '/')
-+            {
-+              if (*string != '\\' && *string != '/')
-+                return 0;
-+              string ++; expr++;
-+            }
-+          else if (*expr == '*')
-+            {
-+              if (*expr ++ == 0)
-+                return 1;
-+              while (*++string != *expr)
-+                if (*string == 0)
-+                  return 0;
-+            }
-+        }
-       else
--	{
--	  if (*string != *expr)
--	    return 0;
--	  if (*expr++ == 0)
--	    return 1;
--	  string++;
--	}
-+        {
-+          if (*string != *expr)
-+            return 0;
-+          if (*expr++ == 0)
-+            return 1;
-+          string++;
-+        }
-     }
- }
- 
--/* recursive make directory */
--/* abort if you get an ENOENT errno somewhere in the middle */
--/* e.g. ignore error "mkdir on existing directory" */
--/* */
-+
-+/* recursive mkdir */
-+/* abort on ENOENT; ignore other errors like "directory already exists" */
- /* return 1 if OK */
- /*        0 on error */
- 
-@@ -217,7 +331,7 @@
-   char *buffer = strdup(newdir);
-   char *p;
-   int  len = strlen(buffer);
--  
-+
-   if (len <= 0) {
-     free(buffer);
-     return 0;
-@@ -225,7 +339,7 @@
-   if (buffer[len-1] == '/') {
-     buffer[len-1] = '\0';
-   }
--  if (mkdir(buffer, 0775) == 0)
-+  if (mkdir(buffer, 0755) == 0)
-     {
-       free(buffer);
-       return 1;
-@@ -235,202 +349,356 @@
-   while (1)
-     {
-       char hold;
--      
-+
-       while(*p && *p != '\\' && *p != '/')
--	p++;
-+        p++;
-       hold = *p;
-       *p = 0;
--      if ((mkdir(buffer, 0775) == -1) && (errno == ENOENT))
--	{
--	  fprintf(stderr,"%s: couldn't create directory %s\n",prog,buffer);
--	  free(buffer);
--	  return 0;
--	}
-+      if ((mkdir(buffer, 0755) == -1) && (errno == ENOENT))
-+        {
-+          fprintf(stderr,"%s: Couldn't create directory %s\n",prog,buffer);
-+          free(buffer);
-+          return 0;
-+        }
-       if (hold == 0)
--	break;
-+        break;
-       *p++ = hold;
-     }
-   free(buffer);
-   return 1;
- }
- 
-+
- int matchname (int arg,int argc,char **argv,char *fname)
- {
--  if (arg == argc)		/* no arguments given (untgz tgzarchive) */
-+  if (arg == argc)      /* no arguments given (untgz tgzarchive) */
-     return 1;
- 
-   while (arg < argc)
-     if (ExprMatch(fname,argv[arg++]))
--	 return 1;
-+      return 1;
- 
-   return 0; /* ignore this for the moment being */
- }
- 
- 
--/* Tar file list or extract */
-+/* tar file list or extract */
- 
--int untar (gzFile in, const char *dest) {
--	union  tar_buffer buffer;
--	int    len;
--	int    err;
--	int    getheader = 1;
--	int    remaining = 0;
--	FILE   *outfile = NULL;
--	char   fname[BLOCKSIZE];
--	time_t tartime;
--  
--	while (1) {
--		len = gzread(in, &buffer, BLOCKSIZE);
--		if (len < 0)
--			error (gzerror(in, &err));
--		/*
--		* Always expect complete blocks to process
--		* the tar information.
--		*/
--		if (len != BLOCKSIZE)
--			error("gzread: incomplete block read");
--	 
--		/*
--		* If we have to get a tar header
--		*/
--		if (getheader == 1) {
--			/*
--			* if we met the end of the tar
--			* or the end-of-tar block,
--			* we are done
--			*/
--			if ((len == 0)  || (buffer.header.name[0]== 0)) break;
--
--			tartime = (time_t)getoct(buffer.header.mtime,12);
--			strcpy(fname, dest);
--			if ((fname[strlen(fname)-1] != '/') && (fname[strlen(fname)-1] != '\\'))
--					strcat(fname, "/");
--			strcat(fname, buffer.header.name);
--	  
--			switch (buffer.header.typeflag) {
--			case DIRTYPE:
--				makedir(fname);
--				break;
--			case REGTYPE:
--			case AREGTYPE:
--				remaining = getoct(buffer.header.size,12);
--				if (remaining) {
--					outfile = fopen(fname,"wb");
--					if (outfile == NULL) {
--						// try creating directory
--						char *p = strrchr(fname, '/');
--						if (p != NULL) {
--							*p = '\0';
--							makedir(fname);
--							*p = '/';
--							outfile = fopen(fname,"wb");
--						}
--					}
--/*
--					fprintf(stderr,
--						"%s %s\n",
--						(outfile) ? "Extracting" : "Couldn't create",
--						fname);
--*/
--				}
--				else
--					outfile = NULL;
--				/*
--				* could have no contents
--				*/
--				getheader = (remaining) ? 0 : 1;
--				break;
--			default:
--				break;
--			}
--		}
--		else	{
--			unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
--
--			if (outfile != NULL) {
--				if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes) {
--					fprintf(stderr,"%s : error writing %s skipping...\n",prog,fname);
--					fclose(outfile);
--					unlink(fname);
--				}
--			}
--			remaining -= bytes;
--			if (remaining == 0) {
--				getheader = 1;
--				if (outfile != NULL) {
--#ifdef WIN32
--					HANDLE hFile;
--					FILETIME ftm,ftLocal;
--					SYSTEMTIME st;
--					struct tm localt;
-- 
--					fclose(outfile);
--
--					localt = *localtime(&tartime);
--
--					hFile = CreateFile(fname, GENERIC_READ | GENERIC_WRITE,
--					0, NULL, OPEN_EXISTING, 0, NULL);
--		  
--					st.wYear = (WORD)localt.tm_year+1900;
--					st.wMonth = (WORD)localt.tm_mon;
--					st.wDayOfWeek = (WORD)localt.tm_wday;
--					st.wDay = (WORD)localt.tm_mday;
--					st.wHour = (WORD)localt.tm_hour;
--					st.wMinute = (WORD)localt.tm_min;
--					st.wSecond = (WORD)localt.tm_sec;
--					st.wMilliseconds = 0;
--					SystemTimeToFileTime(&st,&ftLocal);
--					LocalFileTimeToFileTime(&ftLocal,&ftm);
--					SetFileTime(hFile,&ftm,NULL,&ftm);
--					CloseHandle(hFile);
-+//int tar (gzFile in,int action,int arg,int argc,char **argv)
-+int tar (gzFile in,int action,const char *dest,int arg,int argc,char **argv)
-+{
-+  union  tar_buffer buffer;
-+  int    len;
-+  int    err;
-+  int    getheader = 1;
-+  int    remaining = 0;
-+  FILE   *outfile = NULL;
-+  char   fname[BLOCKSIZE];
-+  int    tarmode = 0;
-+  time_t tartime;
-+  struct attr_item *attributes = NULL;
-+
-+  if (action == TGZ_LIST)
-+    printf("    date      time     size                       file\n"
-+           " ---------- -------- --------- -------------------------------------\n");
-+  while (1)
-+    {
-+      len = gzread(in, &buffer, BLOCKSIZE);
-+      if (len < 0)
-+        error(gzerror(in, &err));
-+      /*
-+       * Always expect complete blocks to process
-+       * the tar information.
-+       */
-+      if (len != BLOCKSIZE)
-+        {
-+          action = TGZ_INVALID; /* force error exit */
-+          remaining = 0;        /* force I/O cleanup */
-+        }
-+
-+      /*
-+       * If we have to get a tar header
-+       */
-+      if (getheader >= 1)
-+        {
-+          /*
-+           * if we met the end of the tar
-+           * or the end-of-tar block,
-+           * we are done
-+           */
-+          if (len == 0 || buffer.header.name[0] == 0)
-+            break;
-+
-+          tarmode = getoct(buffer.header.mode,8);
-+          tartime = (time_t)getoct(buffer.header.mtime,12);
-+
-+	// ADDED for Sword
-+          strncpy(fname, dest, SHORTNAMESIZE);
-+          if ((fname[strlen(fname)-1] != '/') && (fname[strlen(fname)-1] != '\\'))
-+              strcat(fname, "/");
-+        // END addition
-+          if (tarmode == -1 || tartime == (time_t)-1)
-+            {
-+              buffer.header.name[0] = 0;
-+              action = TGZ_INVALID;
-+            }
-+          // MODIFIED for Sword
-+              strncat(fname, buffer.header.name, BLOCKSIZE - strlen(fname) - 10);
-+#if 0
-+          if (getheader == 1)
-+            {
-+              strncpy(fname,buffer.header.name,SHORTNAMESIZE);
-+              if (fname[SHORTNAMESIZE-1] != 0)
-+                  fname[SHORTNAMESIZE] = 0;
-+            }
-+           // END modification
-+          else
-+            {
-+              /*
-+               * The file name is longer than SHORTNAMESIZE
-+               */
-+              if (strncmp(fname,buffer.header.name,SHORTNAMESIZE-1) != 0)
-+                  error("bad long name");
-+              getheader = 1;
-+            }
-+#endif
-+          /*
-+           * Act according to the type flag
-+           */
-+          switch (buffer.header.typeflag)
-+            {
-+            case DIRTYPE:
-+              if (action == TGZ_LIST)
-+                printf(" %s     <dir> %s\n",strtime(&tartime),fname);
-+              if (action == TGZ_EXTRACT)
-+                {
-+                  makedir(fname);
-+                  push_attr(&attributes,fname,tarmode,tartime);
-+                }
-+              break;
-+            case REGTYPE:
-+            case AREGTYPE:
-+              remaining = getoct(buffer.header.size,12);
-+              if (remaining == -1)
-+                {
-+                  action = TGZ_INVALID;
-+                  break;
-+                }
-+              if (action == TGZ_LIST)
-+                printf(" %s %9d %s\n",strtime(&tartime),remaining,fname);
-+              else if (action == TGZ_EXTRACT)
-+                {
-+                  if (matchname(arg,argc,argv,fname))
-+                    {
-+                      outfile = fopen(fname,"wb");
-+                      if (outfile == NULL) {
-+                        /* try creating directory */
-+                        char *p = strrchr(fname, '/');
-+                        if (p != NULL) {
-+                          *p = '\0';
-+                          makedir(fname);
-+                          *p = '/';
-+                          outfile = fopen(fname,"wb");
-+                        }
-+                      }
-+                      if (outfile != NULL)
-+                        printf("Extracting %s\n",fname);
-+                      else
-+                        fprintf(stderr, "%s: Couldn't create %s",prog,fname);
-+                    }
-+                  else
-+                    outfile = NULL;
-+                }
-+              getheader = 0;
-+              break;
-+            case GNUTYPE_LONGLINK:
-+            case GNUTYPE_LONGNAME:
-+              remaining = getoct(buffer.header.size,12);
-+              if (remaining < 0 || remaining >= BLOCKSIZE)
-+                {
-+                  action = TGZ_INVALID;
-+                  break;
-+                }
-+              len = gzread(in, fname, BLOCKSIZE);
-+              if (len < 0)
-+                error(gzerror(in, &err));
-+              if (fname[BLOCKSIZE-1] != 0 || (int)strlen(fname) > remaining)
-+                {
-+                  action = TGZ_INVALID;
-+                  break;
-+                }
-+              getheader = 2;
-+              break;
-+            default:
-+              if (action == TGZ_LIST)
-+                printf(" %s     <---> %s\n",strtime(&tartime),fname);
-+              break;
-+            }
-+        }
-+      else
-+        {
-+          unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
- 
--					outfile = NULL;
--#else
--					struct utimbuf settime;
-+          if (outfile != NULL)
-+            {
-+              if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
-+                {
-+                  fprintf(stderr,
-+                    "%s: Error writing %s -- skipping\n",prog,fname);
-+                  fclose(outfile);
-+                  outfile = NULL;
-+                  remove(fname);
-+                }
-+            }
-+          remaining -= bytes;
-+        }
-+
-+      if (remaining == 0)
-+        {
-+          getheader = 1;
-+          if (outfile != NULL)
-+            {
-+              fclose(outfile);
-+              outfile = NULL;
-+              if (action != TGZ_INVALID)
-+                push_attr(&attributes,fname,tarmode,tartime);
-+            }
-+        }
-+
-+      /*
-+       * Abandon if errors are found
-+       */
-+      if (action == TGZ_INVALID)
-+        {
-+          error("broken archive");
-+          break;
-+        }
-+    }
- 
--					settime.actime = settime.modtime = tartime;
-+  /*
-+   * Restore file modes and time stamps
-+   */
-+  restore_attr(&attributes);
- 
--					fclose(outfile);
--					outfile = NULL;
--					utime(fname,&settime);
--#endif
--				}
--			}
--		}
--	}
--	return 0;
-+  if (gzclose(in) != Z_OK)
-+    error("failed gzclose");
-+
-+  return 0;
- }
- 
- 
--/* =========================================================== */
-+/* ============================================================ */
- 
- void help(int exitval)
- {
--  fprintf(stderr,
--	  "untgz v 0.1\n"
--	  " an sample application of zlib 1.0.4\n\n"
--		"Usage : untgz TGZfile            to extract all files\n"
--		"        untgz TGZfile fname ...  to extract selected files\n"
--		"        untgz -l TGZfile         to list archive contents\n"
--		"        untgz -h                 to display this help\n\n");
-+  printf("untgz version 0.2.1\n"
-+         "  using zlib version %s\n\n",
-+         zlibVersion());
-+  printf("Usage: untgz file.tgz            extract all files\n"
-+         "       untgz file.tgz fname ...  extract selected files\n"
-+         "       untgz -l file.tgz         list archive contents\n"
-+         "       untgz -h                  display this help\n");
-   exit(exitval);
- }
- 
- void error(const char *msg)
- {
--    fprintf(stderr, "%s: %s\n", prog, msg);
--    exit(1);
-+  fprintf(stderr, "%s: %s\n", prog, msg);
-+  exit(1);
- }
- 
- 
-+/* ============================================================ */
-+
-+#if defined(WIN32) && defined(__GNUC__)
-+int _CRT_glob = 0;      /* disable argument globbing in MinGW */
-+#endif
-+
-+int untar(gzFile in, const char *dest)
-+{
-+	return tar(in, TGZ_EXTRACT, dest, 0, 0 , NULL);
-+}
-+
- int untargz(int fd, const char *dest) {
--	gzFile	*f;
-+        gzFile  *f;
- 
--	f = gzdopen(fd, "rb");
--	if (f == NULL) {
--		fprintf(stderr,"%s: Couldn't gzopen file\n",	prog);
--		return 1;
--	}
-+        f = gzdopen(fd, "rb");
-+        if (f == NULL) {
-+                fprintf(stderr,"%s: Couldn't gzopen file\n",    prog);
-+                return 1;
-+        }
- 
--	return untar(f, dest);
-+        return untar(f, dest);
- }
-+
-+#if 0
-+int main(int argc,char **argv)
-+{
-+    int         action = TGZ_EXTRACT;
-+    int         arg = 1;
-+    char        *TGZfile;
-+    gzFile      *f;
-+
-+    prog = strrchr(argv[0],'\\');
-+    if (prog == NULL)
-+      {
-+        prog = strrchr(argv[0],'/');
-+        if (prog == NULL)
-+          {
-+            prog = strrchr(argv[0],':');
-+            if (prog == NULL)
-+              prog = argv[0];
-+            else
-+              prog++;
-+          }
-+        else
-+          prog++;
-+      }
-+    else
-+      prog++;
-+
-+    if (argc == 1)
-+      help(0);
-+
-+    if (strcmp(argv[arg],"-l") == 0)
-+      {
-+        action = TGZ_LIST;
-+        if (argc == ++arg)
-+          help(0);
-+      }
-+    else if (strcmp(argv[arg],"-h") == 0)
-+      {
-+        help(0);
-+      }
-+
-+    if ((TGZfile = TGZfname(argv[arg])) == NULL)
-+      TGZnotfound(argv[arg]);
-+
-+    ++arg;
-+    if ((action == TGZ_LIST) && (arg != argc))
-+      help(1);
-+
-+/*
-+ *  Process the TGZ file
-+ */
-+    switch(action)
-+      {
-+      case TGZ_LIST:
-+      case TGZ_EXTRACT:
-+        f = gzopen(TGZfile,"rb");
-+        if (f == NULL)
-+          {
-+            fprintf(stderr,"%s: Couldn't gzopen %s\n",prog,TGZfile);
-+            return 1;
-+          }
-+        exit(tar(f, action, arg, argc, argv));
-+      break;
-+
-+      default:
-+        error("Unknown option");
-+        exit(1);
-+      }
-+
-+    return 0;
-+}
-+#endif
-Index: sword-1.5.9/include/ftptrans.h
-===================================================================
---- sword-1.5.9.orig/include/ftptrans.h	2006-11-25 11:56:18.000000000 +0000
-+++ sword-1.5.9/include/ftptrans.h	2006-11-25 11:59:03.000000000 +0000
-@@ -18,7 +18,8 @@
- /** Class for reporting status

- */

- class SWDLLEXPORT StatusReporter {

--public:

-+public:
-+	virtual ~StatusReporter() {};

- 	/** Messages before stages of a batch download */

- 	virtual void preStatus(long totalBytes, long completedBytes, const char *message);

- 	

-Index: sword-1.5.9/src/mgr/filemgr.cpp
-===================================================================
---- sword-1.5.9.orig/src/mgr/filemgr.cpp	2006-11-25 12:01:21.000000000 +0000
-+++ sword-1.5.9/src/mgr/filemgr.cpp	2006-11-25 12:08:34.000000000 +0000
-@@ -490,7 +490,7 @@
- int FileMgr::copyDir(const char *srcDir, const char *destDir) {
- 	DIR *dir;
- 	struct dirent *ent;
--	if (dir = opendir(srcDir)) {
-+	if ((dir = opendir(srcDir))) {
- 		rewinddir(dir);
- 		while ((ent = readdir(dir))) {
- 			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
-Index: sword-1.5.9/src/mgr/ftptrans.cpp
-===================================================================
---- sword-1.5.9.orig/src/mgr/ftptrans.cpp	2006-11-25 12:08:52.000000000 +0000
-+++ sword-1.5.9/src/mgr/ftptrans.cpp	2006-11-25 12:09:27.000000000 +0000
-@@ -86,7 +86,7 @@
- 

- 

- int FTPTransport::copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix) {

--	int i;

-+	unsigned int i;

- 	int retVal = 0;

- 	

- 	SWBuf url = SWBuf(urlPrefix) + SWBuf(dir);

-Index: sword-1.5.9/src/mgr/installmgr.cpp
-===================================================================
---- sword-1.5.9.orig/src/mgr/installmgr.cpp	2006-11-25 12:09:52.000000000 +0000
-+++ sword-1.5.9/src/mgr/installmgr.cpp	2006-11-25 12:10:41.000000000 +0000
-@@ -145,7 +145,7 @@
- 
- 			FileMgr::removeDir(modDir.c_str());
- 
--			if (dir = opendir(manager->configPath)) {	// find and remove .conf file
-+			if ((dir = opendir(manager->configPath))) {	// find and remove .conf file
- 				rewinddir(dir);
- 				while ((ent = readdir(dir))) {
- 					if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
-@@ -210,7 +210,6 @@
- 
- int InstallMgr::ftpCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) {
- 	int retVal = 0;
--	long i;
- 	FTPTransport *trans = createFTPTransport(is->source, statusReporter);
- 	transport = trans; // set classwide current transport for other thread terminate() call
- 	trans->setPassive(passive);
-@@ -364,7 +363,7 @@
- 		}
- 		if (!aborted) {
- 			SWBuf confDir = sourceDir + "/mods.d/";
--			if (dir = opendir(confDir.c_str())) {	// find and copy .conf file
-+			if ((dir = opendir(confDir.c_str()))) {	// find and copy .conf file
- 				rewinddir(dir);
- 				while ((ent = readdir(dir))) {
- 					if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
-Index: sword-1.5.9/src/modules/comments/swcom.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/comments/swcom.cpp	2006-11-25 12:40:13.000000000 +0000
-+++ sword-1.5.9/src/modules/comments/swcom.cpp	2006-11-25 12:40:22.000000000 +0000
-@@ -75,7 +75,7 @@
- 
- 
- VerseKey &SWCom::getVerseKey() const {
--	VerseKey *key;
-+	VerseKey *key = NULL;
- 	// see if we have a VerseKey * or decendant
- 	SWTRY {
- 		key = SWDYNAMIC_CAST(VerseKey, this->key);
-Index: sword-1.5.9/src/modules/common/entriesblk.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/entriesblk.cpp	2006-11-25 12:15:11.000000000 +0000
-+++ sword-1.5.9/src/modules/common/entriesblk.cpp	2006-11-25 12:15:32.000000000 +0000
-@@ -142,9 +142,7 @@
- 	unsigned long dataSize;
- 	getRawData(&dataSize);
- 	getMetaEntry(entryIndex, &offset, &size);
--	unsigned long len = size - 1;
- 	int count = getCount();
--	unsigned long dataStart = METAHEADERSIZE + (count * METAENTRYSIZE);
- 
- 	if (!offset)	// already deleted
- 		return;
-Index: sword-1.5.9/src/modules/common/rawstr.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/rawstr.cpp	2006-11-25 12:11:58.000000000 +0000
-+++ sword-1.5.9/src/modules/common/rawstr.cpp	2006-11-25 12:12:36.000000000 +0000
-@@ -124,7 +124,6 @@
- 
- void RawStr::getIDXBuf(long ioffset, char **buf)
- {
--	char *trybuf, *targetbuf;
- 	long offset;
- 	
- 	if (idxfd > 0) {
-@@ -152,7 +151,7 @@
- 
- signed char RawStr::findOffset(const char *ikey, long *start, unsigned short *size, long away, long *idxoff)
- {
--	char *trybuf, *targetbuf, *key = 0, quitflag = 0;
-+	char *trybuf, *key = 0, quitflag = 0;
- 	signed char retval = -1;
- 	long headoff, tailoff, tryoff = 0, maxoff = 0;
- 
-Index: sword-1.5.9/src/modules/common/rawstr4.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/rawstr4.cpp	2006-11-25 12:12:41.000000000 +0000
-+++ sword-1.5.9/src/modules/common/rawstr4.cpp	2006-11-25 12:13:43.000000000 +0000
-@@ -123,7 +123,6 @@
- 
- void RawStr4::getIDXBuf(long ioffset, char **buf)
- {
--	char *trybuf, *targetbuf;
- 	long offset;
- 	
- 	if (idxfd > 0) {
-@@ -160,7 +159,7 @@
- 
- signed char RawStr4::findOffset(const char *ikey, long *start, unsigned long *size, long away, long *idxoff)
- {
--	char *trybuf, *targetbuf, *key = 0, quitflag = 0;
-+	char *trybuf, *key = 0, quitflag = 0;
- 	signed char retval = -1;
- 	long headoff, tailoff, tryoff = 0, maxoff = 0;
- 
-@@ -372,7 +371,7 @@
- 	while (true);	// while we're resolving links
- 
- 	if (idxbuflocal) {
--		int localsize = strlen(idxbuflocal);
-+		unsigned int localsize = strlen(idxbuflocal);
- 		localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1);
- 		strncpy(*idxbuf, idxbuflocal, localsize);
- 		(*idxbuf)[localsize] = 0;
-Index: sword-1.5.9/src/modules/common/zstr.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/zstr.cpp	2006-11-25 12:14:25.000000000 +0000
-+++ sword-1.5.9/src/modules/common/zstr.cpp	2006-11-25 12:14:57.000000000 +0000
-@@ -619,7 +619,7 @@
- 			rawZFilter(buf, 1); // 1 = encipher
- 
- 			long zdxSize = zdxfd->seek(0, SEEK_END);
--			long zdtSize = zdtfd->seek(0, SEEK_END);
-+			unsigned long zdtSize = zdtfd->seek(0, SEEK_END);
- 
- 			if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) {	// New Block
- 				start = zdtSize;
-Index: sword-1.5.9/src/modules/common/zverse.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/common/zverse.cpp	2006-11-25 12:13:58.000000000 +0000
-+++ sword-1.5.9/src/modules/common/zverse.cpp	2006-11-25 12:14:08.000000000 +0000
-@@ -140,7 +140,6 @@
- 	unsigned long ulCompOffset=0;	       // compressed buffer start
- 	unsigned long ulCompSize=0;	             // buffer size compressed
- 	unsigned long ulUnCompSize=0;	          // buffer size uncompressed
--	char *pcCompText=NULL;					 // compressed text
- 
- 	*start = *size = 0;
- 	//printf ("Finding offset %ld\n", idxoff);
-Index: sword-1.5.9/src/modules/filters/gbfheadings.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfheadings.cpp	2006-11-25 12:29:24.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfheadings.cpp	2006-11-25 12:29:37.000000000 +0000
-@@ -31,7 +31,6 @@
- 		char token[2048]; // cheese.  Fix.
- 		int tokpos = 0;
- 		bool intoken = false;
--		int len;
- 		bool hide = false;
- 
- 	const char *from;
-Index: sword-1.5.9/src/modules/filters/gbfhtmlhref.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfhtmlhref.cpp	2006-11-25 12:27:35.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfhtmlhref.cpp	2006-11-25 12:28:00.000000000 +0000
-@@ -72,9 +72,6 @@
- 
- bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
- 	const char *tok;
--	char val[128];
--	char *valto;
--	const char *num;
- 	MyUserData *u = (MyUserData *)userData;
- 
- 	if (!substituteToken(buf, token)) {
-@@ -227,7 +224,7 @@
- 		else if (!strcmp(tag.getName(), "RF")) {
- 			SWBuf type = tag.getAttribute("type");
- 			SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
--			VerseKey *vkey;
-+			VerseKey *vkey = NULL;
- 			// see if we have a VerseKey * or descendant
- 			SWTRY {
- 				vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-Index: sword-1.5.9/src/modules/filters/gbfmorph.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfmorph.cpp	2006-11-25 12:30:20.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfmorph.cpp	2006-11-25 12:30:31.000000000 +0000
-@@ -31,7 +31,6 @@
- 		char token[2048]; // cheese.  Fix.
- 		int tokpos = 0;
- 		bool intoken = false;
--		int len;
- 		bool lastspace = false;
- 
- 		SWBuf orig = text;
-Index: sword-1.5.9/src/modules/filters/gbfosis.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfosis.cpp	2006-11-25 12:35:45.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfosis.cpp	2006-11-25 12:36:22.000000000 +0000
-@@ -36,8 +36,6 @@
- 	SWBuf tmp;
- 	SWBuf value;
- 	
--	bool newtext = false;
--	
- 	bool suspendTextPassThru = false;
- 	bool handled = false;
- 	bool newWord = false;
-@@ -45,15 +43,13 @@
- 	bool lastspace = false;
- 	
- 	const char *wordStart = text.c_str();
--	const char *wordEnd;
-+	const char *wordEnd = NULL;
- 	
--	const char *textStart;
--	const char *textEnd;
-+	const char *textStart = NULL;
-+	const char *textEnd = NULL;
- 	
- 	SWBuf textNode = "";
- 
--	char wordstr[5];
--	
- 	SWBuf buf;
- 		
- 	text = "";
-Index: sword-1.5.9/src/modules/filters/gbfredletterwords.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfredletterwords.cpp	2006-11-25 12:29:53.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfredletterwords.cpp	2006-11-25 12:30:08.000000000 +0000
-@@ -35,7 +35,6 @@
- 		char token[4096]; // cheese.  Fix.
- 		int tokpos = 0;
- 		bool intoken = false;
--		int len;
- 		bool hide = false;
- 
- 	const char *from;
-Index: sword-1.5.9/src/modules/filters/gbfrtf.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfrtf.cpp	2006-11-25 12:28:19.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfrtf.cpp	2006-11-25 12:28:34.000000000 +0000
-@@ -23,14 +23,12 @@
- 	char *num;
- 	int tokpos = 0;
- 	bool intoken = false;
--	int len;
- 	const char *tok;
- 	SWBuf strongnum;
- 	SWBuf strongtense;
- 	bool hideText = false;
- 	int wordLen = 0;
- 	int wordCount = 0;
--	int i;
- 
- 	const char *from;
- 	SWBuf orig = text;
-Index: sword-1.5.9/src/modules/filters/gbfstrongs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfstrongs.cpp	2006-11-25 12:28:46.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfstrongs.cpp	2006-11-25 12:29:05.000000000 +0000
-@@ -32,13 +32,11 @@
- 	char token[2048]; // cheese.  Fix.
- 	int tokpos = 0;
- 	bool intoken = false;
--	int len;
- 	bool lastspace = false;
- 	int word = 1;
- 	char val[128];
- 	char wordstr[5];
- 	char *valto;
--	char *ch;
- 	unsigned int textStart = 0, textEnd = 0;
- 	bool newText = false;
- 	SWBuf tmp;
-Index: sword-1.5.9/src/modules/filters/gbfthml.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfthml.cpp	2006-11-25 12:35:23.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfthml.cpp	2006-11-25 12:35:32.000000000 +0000
-@@ -30,7 +30,6 @@
- 	char token[2048];
- 	int tokpos = 0;
- 	bool intoken 	= false;
--	int len;
- 	const char *tok;
- 
- 	SWBuf orig = text;
-Index: sword-1.5.9/src/modules/filters/gbfwordjs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/gbfwordjs.cpp	2006-11-25 12:30:42.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfwordjs.cpp	2006-11-25 12:31:25.000000000 +0000
-@@ -44,11 +44,8 @@
- 		bool lastspace = false;
- 		int word = 1;
- 		char val[128];
--		char *valto;
--		char *ch;
- 		char wordstr[5];
- 		unsigned int textStart = 0, lastAppendLen = 0, textEnd = 0;
--		char gh = 0;
- 		SWBuf tmp;
- 		bool newText = false;
- 		bool needWordOut = false;
-@@ -166,7 +163,7 @@
- 						else {
- 							wordID = key->getText();
- 						}
--						for (int i = 0; i < wordID.size(); i++) {
-+						for (unsigned int i = 0; i < wordID.size(); i++) {
- 							if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
- 								wordID[i] = '_';
- 							}
-@@ -258,7 +255,7 @@
- 			else {
- 				wordID = key->getText();
- 			}
--			for (int i = 0; i < wordID.size(); i++) {
-+			for (unsigned int i = 0; i < wordID.size(); i++) {
- 				if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
- 					wordID[i] = '_';
- 				}
-Index: sword-1.5.9/src/modules/filters/greeklexattribs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/greeklexattribs.cpp	2006-11-25 12:37:37.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/greeklexattribs.cpp	2006-11-25 12:37:50.000000000 +0000
-@@ -29,7 +29,7 @@
- 		string freq;
- 		char val[128], *valto;
- 		char wordstr[7];
--		const char *currentPhrase = 0, *ch = 0;
-+		const char *currentPhrase = 0;
- 		const char *currentPhraseEnd = 0;
- 		int number = 0;
- 
-Index: sword-1.5.9/src/modules/filters/latin1utf16.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/latin1utf16.cpp	2006-11-25 12:15:59.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/latin1utf16.cpp	2006-11-25 12:16:06.000000000 +0000
-@@ -18,7 +18,6 @@
- 
- char Latin1UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
-     const unsigned char *from;
--    int len;
- 	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
- 		return (char)-1;
-    
-Index: sword-1.5.9/src/modules/filters/osishtmlhref.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osishtmlhref.cpp	2006-11-25 12:17:56.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osishtmlhref.cpp	2006-11-25 12:19:37.000000000 +0000
-@@ -114,19 +114,19 @@
- 
- 				const char *attrib;
- 				const char *val;
--				if (attrib = tag.getAttribute("xlit")) {
-+				if ((attrib = tag.getAttribute("xlit"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					outText(" ", buf, u);
- 					outText(val, buf, u);
- 				}
--				if (attrib = tag.getAttribute("gloss")) {
-+				if ((attrib = tag.getAttribute("gloss"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					outText(" ", buf, u);
- 					outText(val, buf, u);
- 				}
--				if (attrib = tag.getAttribute("lemma")) {
-+				if ((attrib = tag.getAttribute("lemma"))) {
- 					int count = tag.getAttributePartCount("lemma", ' ');
- 					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 					do {
-@@ -155,7 +155,7 @@
- 						
- 					} while (++i < count);
- 				}
--				if (attrib = tag.getAttribute("morph")) { // && (show)) {
-+				if ((attrib = tag.getAttribute("morph"))) { // && (show)) {
- 					SWBuf savelemma = tag.getAttribute("savlm");
- 					//if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
- 					//	show = false;
-@@ -179,7 +179,7 @@
- 						} while (++i < count);
- 					//}
- 				}
--				if (attrib = tag.getAttribute("POS")) {
-+				if ((attrib = tag.getAttribute("POS"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					outText(" ", buf, u);
-@@ -204,7 +204,7 @@
- 
- 					if (!strongsMarkup) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
- 						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
--						VerseKey *vkey;
-+						VerseKey *vkey = NULL;
- 						// see if we have a VerseKey * or descendant
- 						SWTRY {
- 							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-@@ -341,7 +341,7 @@
- 					outText(firstChar, buf, u);
- 					outText("<font size=\"-1\">", buf, u);
- 					
--					for(int i=0;i<strlen(name);i++)
-+					for(unsigned int i=0;i<strlen(name);i++)
- 						outText(toupper(name[i]), buf, u);
- 					outText("</font>", buf, u);
- 				}
-Index: sword-1.5.9/src/modules/filters/osisredletterwords.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osisredletterwords.cpp	2006-11-25 12:24:54.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osisredletterwords.cpp	2006-11-25 12:25:04.000000000 +0000
-@@ -33,7 +33,6 @@
- 	
- 	SWBuf token;
- 	bool intoken    = false;
--	char buf[254];
- 
- 	SWBuf orig = text;
- 	const char *from = orig.c_str();
-Index: sword-1.5.9/src/modules/filters/osisrtf.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osisrtf.cpp	2006-11-25 12:23:28.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osisrtf.cpp	2006-11-25 12:24:35.000000000 +0000
-@@ -162,19 +162,19 @@
- 
- 				const char *attrib;
- 				const char *val;
--				if (attrib = tag.getAttribute("xlit")) {
-+				if ((attrib = tag.getAttribute("xlit"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					scratch.setFormatted(" {\\fs15 <%s>}", val);
- 					outText(scratch.c_str(), buf, u);
- 				}
--				if (attrib = tag.getAttribute("gloss")) {
-+				if ((attrib = tag.getAttribute("gloss"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					scratch.setFormatted(" {\\fs15 <%s>}", val);
- 					outText(scratch.c_str(), buf, u);
- 				}
--				if (attrib = tag.getAttribute("lemma")) {
-+				if ((attrib = tag.getAttribute("lemma"))) {
- 					int count = tag.getAttributePartCount("lemma", ' ');
- 					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 					do {
-@@ -213,7 +213,7 @@
- 						} while (++i < count);
- 					}
- 				}
--				if (attrib = tag.getAttribute("POS")) {
-+				if ((attrib = tag.getAttribute("POS"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					scratch.setFormatted(" {\\fs15 <%s>}", val);
-@@ -235,7 +235,7 @@
- 							&& (type != "strongsMarkup")		// deprecated
- 							) {
- 						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
--						VerseKey *vkey;
-+						VerseKey *vkey = NULL;
- 						// see if we have a VerseKey * or descendant
- 						SWTRY {
- 							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-Index: sword-1.5.9/src/modules/filters/osisscripref.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osisscripref.cpp	2006-11-25 12:25:18.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osisscripref.cpp	2006-11-25 12:25:25.000000000 +0000
-@@ -33,9 +33,6 @@
- 	bool hide       = false;
- 	SWBuf tagText;
- 	XMLTag startTag;
--	int tagTextNum  = 1;
--	int footnoteNum = 1;
--	char buf[254];
- 
- 	SWBuf orig = text;
- 	const char *from = orig.c_str();
-Index: sword-1.5.9/src/modules/filters/osisstrongs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osisstrongs.cpp	2006-11-25 12:21:41.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osisstrongs.cpp	2006-11-25 12:22:57.000000000 +0000
-@@ -38,8 +38,6 @@
- 	bool lastspace = false;
- 	int wordNum = 1;
- 	char wordstr[5];
--	char *valto;
--	char *ch;
- 	const char *wordStart = 0;
- 
- 	const SWBuf orig = text;
-@@ -72,9 +70,8 @@
- 					SWBuf lemmaClass = "";
- 
- 					const char *attrib;
--					const char *val;
- 					sprintf(wordstr, "%03d", wordNum);
--					if (attrib = wtag.getAttribute("morph")) {
-+					if ((attrib = wtag.getAttribute("morph"))) {
- 						int count = wtag.getAttributePartCount("morph", ' ');
- 						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 						do {
-@@ -106,7 +103,7 @@
- 						} while (++i < count);
- 					}
- 
--					if (attrib = wtag.getAttribute("lemma")) {
-+					if ((attrib = wtag.getAttribute("lemma"))) {
- 						int count = wtag.getAttributePartCount("lemma", ' ');
- 						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 						do {
-@@ -147,7 +144,7 @@
- 						module->getEntryAttributes()["Word"][wordstr]["PartCount"].setFormatted("%d", count);
- 					}
- 
--					if (attrib = wtag.getAttribute("src")) {
-+					if ((attrib = wtag.getAttribute("src"))) {
- 						int count = wtag.getAttributePartCount("src", ' ');
- 						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 						do {
-Index: sword-1.5.9/src/modules/filters/osisvariants.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osisvariants.cpp	2006-11-25 12:25:40.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osisvariants.cpp	2006-11-25 12:26:14.000000000 +0000
-@@ -62,7 +62,7 @@
- 		const char *from = orig.c_str();
- 
- 		//we use a fixed comparision string to make sure the loop is as fast as the original two blocks with almost the same code
--		const char* variantCompareString = (option == 0) ? "div type=\"variant\" class=\"1\"" : "div type=\"variant\" class=\"2\"";
-+		//const char* variantCompareString = (option == 0) ? "div type=\"variant\" class=\"1\"" : "div type=\"variant\" class=\"2\"";
- 		
- 		for (text = ""; *from; from++) {
- 			if (*from == '<') {
-Index: sword-1.5.9/src/modules/filters/osiswebif.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osiswebif.cpp	2006-11-25 12:20:00.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osiswebif.cpp	2006-11-25 12:21:25.000000000 +0000
-@@ -69,17 +69,17 @@
- 
- 				const char *attrib;
- 				const char *val;
--				if (attrib = tag.getAttribute("xlit")) {
-+				if ((attrib = tag.getAttribute("xlit"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- //					buf.appendFormatted(" %s", val);
- 				}
--				if (attrib = tag.getAttribute("gloss")) {
-+				if ((attrib = tag.getAttribute("gloss"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					buf.appendFormatted(" %s", val);
- 				}
--				if (attrib = tag.getAttribute("lemma")) {
-+				if ((attrib = tag.getAttribute("lemma"))) {
- 					int count = tag.getAttributePartCount("lemma", ' ');
- 					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 					do {
-@@ -114,7 +114,7 @@
- 						} while (++i < count);
- 					}
- 				}
--				if (attrib = tag.getAttribute("POS")) {
-+				if ((attrib = tag.getAttribute("POS"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					buf.appendFormatted(" %s", val);
-@@ -138,7 +138,7 @@
- 					if (!strongsMarkup) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
- 						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
- 						SWBuf modName = (u->module) ? u->module->Name() : "";
--						VerseKey *vkey;
-+						VerseKey *vkey = NULL;
- 						// see if we have a VerseKey * or descendant
- 						SWTRY {
- 							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-Index: sword-1.5.9/src/modules/filters/osiswordjs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/osiswordjs.cpp	2006-11-25 12:26:29.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/osiswordjs.cpp	2006-11-25 12:27:19.000000000 +0000
-@@ -47,9 +47,6 @@
- 		bool lastspace = false;
- 		int wordNum = 1;
- 		char wordstr[5];
--		char val[128];
--		char *valto;
--		char *ch;
- 		SWBuf modName = (module)?module->Name():"";
- 		// add TR to w src in KJV then remove this next line
- 		SWBuf wordSrcPrefix = (modName == "KJV")?SWBuf("TR"):modName;
-@@ -143,7 +140,7 @@
- 					}
- 					wordID.appendFormatted("_%s", src.c_str());
- 					// clean up our word ID for XHTML
--					for (int i = 0; i < wordID.size(); i++) {
-+					for (unsigned int i = 0; i < wordID.size(); i++) {
- 						if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
- 							wordID[i] = '_';
- 						}
-Index: sword-1.5.9/src/modules/filters/teiplain.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/teiplain.cpp	2006-11-25 12:38:04.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/teiplain.cpp	2006-11-25 12:38:56.000000000 +0000
-@@ -42,7 +42,7 @@
- bool TEIPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {

-   // manually process if it wasn't a simple substitution

- 	if (!substituteToken(buf, token)) {

--		MyUserData *u = (MyUserData *)userData;

-+		//MyUserData *u = (MyUserData *)userData;

- 		XMLTag tag(token);

- 

- 		// <p> paragraph tag

-Index: sword-1.5.9/src/modules/filters/teirtf.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/teirtf.cpp	2006-11-25 12:38:34.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/teirtf.cpp	2006-11-25 12:38:48.000000000 +0000
-@@ -54,7 +54,7 @@
- bool TEIRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {

-   // manually process if it wasn't a simple substitution

- 	if (!substituteToken(buf, token)) {

--		MyUserData *u = (MyUserData *)userData;

-+		//MyUserData *u = (MyUserData *)userData;

- 		XMLTag tag(token);

- 

- 		// <p> paragraph tag

-Index: sword-1.5.9/src/modules/filters/thmlgbf.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlgbf.cpp	2006-11-25 12:32:12.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlgbf.cpp	2006-11-25 12:32:19.000000000 +0000
-@@ -31,7 +31,6 @@
- 	char token[2048];
- 	int tokpos = 0;
- 	bool intoken 	= false;
--	int len;
- 	bool ampersand = false;
- 	bool sechead = false;
- 	bool title = false;  
-Index: sword-1.5.9/src/modules/filters/thmlhtmlhref.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlhtmlhref.cpp	2006-11-25 12:33:24.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlhtmlhref.cpp	2006-11-25 12:33:54.000000000 +0000
-@@ -45,7 +45,6 @@
- 
- 
- bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
--	const char *tok;
- 	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
- 		MyUserData *u = (MyUserData *)userData;		
- 
-@@ -88,7 +87,7 @@
- 				if (!tag.isEmpty()) {
- 					SWBuf type = tag.getAttribute("type");
- 					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
--					VerseKey *vkey;
-+					VerseKey *vkey = NULL;
- 					// see if we have a VerseKey * or descendant
- 					SWTRY {
- 						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-@@ -133,7 +132,7 @@
- 				}
- 				else {
- 					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
--					VerseKey *vkey;
-+					VerseKey *vkey = NULL;
- 					// see if we have a VerseKey * or descendant
- 					SWTRY {
- 						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-Index: sword-1.5.9/src/modules/filters/thmlosis.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlosis.cpp	2006-11-25 12:36:53.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlosis.cpp	2006-11-25 12:37:16.000000000 +0000
-@@ -36,17 +36,16 @@
- //	static QuoteStack quoteStack;
- 	
- 	bool lastspace = false;
--	int word = 1;
- 	char val[128];
- 	SWBuf buf;
- 	char *valto;
- 	char *ch;
- 	
- 	const char *wordStart = text.c_str();
--	const char *wordEnd;
-+	const char *wordEnd = NULL;
- 	
--	const char *textStart;
--	const char *textEnd;
-+	const char *textStart = NULL;
-+	const char *textEnd = NULL;
- 		
- 	bool suspendTextPassThru = false;
- 	bool handled = false;
-Index: sword-1.5.9/src/modules/filters/thmlrtf.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlrtf.cpp	2006-11-25 12:32:32.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlrtf.cpp	2006-11-25 12:33:03.000000000 +0000
-@@ -205,7 +205,6 @@
- 
- 
- bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
--	const char *tok;
- 	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
- 		MyUserData *u = (MyUserData *)userData;		
- 		XMLTag tag(token);
-@@ -238,7 +237,7 @@
- 				if (!tag.isEmpty()) {
- 					SWBuf type = tag.getAttribute("type");
- 					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
--					VerseKey *vkey;
-+					VerseKey *vkey = NULL;
- 					// see if we have a VerseKey * or descendant
- 					SWTRY {
- 						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-@@ -277,7 +276,7 @@
- 				}
- 				else {
- 					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
--					VerseKey *vkey;
-+					VerseKey *vkey = NULL;
- 					// see if we have a VerseKey * or descendant
- 					SWTRY {
- 						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-Index: sword-1.5.9/src/modules/filters/thmlstrongs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlstrongs.cpp	2006-11-25 12:31:42.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlstrongs.cpp	2006-11-25 12:31:47.000000000 +0000
-@@ -34,7 +34,6 @@
- 	const char *from;
- 	int tokpos = 0;
- 	bool intoken = false;
--	int len;
- 	bool lastspace = false;
- 	int word = 1;
- 	char val[128];
-Index: sword-1.5.9/src/modules/filters/thmlwebif.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlwebif.cpp	2006-11-25 12:34:07.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlwebif.cpp	2006-11-25 12:34:17.000000000 +0000
-@@ -28,7 +28,6 @@
- }
- 
- bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
--	const char *tok;
- 
- 	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
- 		MyUserData *u = (MyUserData *)userData;
-Index: sword-1.5.9/src/modules/filters/thmlwordjs.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/thmlwordjs.cpp	2006-11-25 12:34:28.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/thmlwordjs.cpp	2006-11-25 12:35:05.000000000 +0000
-@@ -50,7 +50,6 @@
- 		char *ch;
- 		char wordstr[5];
- 		unsigned int textStart = 0, lastAppendLen = 0, textEnd = 0;
--		char gh = 0;
- 		SWBuf tmp;
- 		bool newText = false;
- 		bool needWordOut = false;
-@@ -179,7 +178,7 @@
- 						else {
- 							wordID = key->getText();
- 						}
--						for (int i = 0; i < wordID.size(); i++) {
-+						for (unsigned int i = 0; i < wordID.size(); i++) {
- 							if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
- 								wordID[i] = '_';
- 							}
-@@ -271,7 +270,7 @@
- 			else {
- 				wordID = key->getText();
- 			}
--			for (int i = 0; i < wordID.size(); i++) {
-+			for (unsigned int i = 0; i < wordID.size(); i++) {
- 				if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
- 					wordID[i] = '_';
- 				}
-Index: sword-1.5.9/src/modules/filters/utf8html.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/utf8html.cpp	2006-11-25 12:17:04.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/utf8html.cpp	2006-11-25 12:17:35.000000000 +0000
-@@ -59,7 +59,7 @@
-           from += subsequent;
-           text += '&';
-           text += '#';
--	  sprintf(digit, "%d", ch);
-+	  sprintf(digit, "%ld", ch);
- 		for (char *dig = digit; *dig; dig++)
- 			text += *dig;
- 		text += ';';
-Index: sword-1.5.9/src/modules/filters/utf8utf16.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/filters/utf8utf16.cpp	2006-11-25 12:16:34.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/utf8utf16.cpp	2006-11-25 12:16:44.000000000 +0000
-@@ -17,7 +17,6 @@
- 
- char UTF8UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
- 	const unsigned char *from;
--	char digit[10];
- 	unsigned long ch;
-         signed short utf16;
- 	unsigned char from2[7];
-Index: sword-1.5.9/src/modules/swmodule.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/swmodule.cpp	2006-11-25 12:11:17.000000000 +0000
-+++ sword-1.5.9/src/modules/swmodule.cpp	2006-11-25 12:11:32.000000000 +0000
-@@ -680,7 +680,6 @@
- 
- 		// entry attributes
- 		else if (searchType == -3) {
--			int i;
- 			RenderText();	// force parse
- 			AttributeTypeList &entryAttribs = getEntryAttributes();
- 			AttributeTypeList::iterator i1Start, i1End;
-Index: sword-1.5.9/src/modules/texts/swtext.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/texts/swtext.cpp	2006-11-25 12:39:28.000000000 +0000
-+++ sword-1.5.9/src/modules/texts/swtext.cpp	2006-11-25 12:39:44.000000000 +0000
-@@ -82,7 +82,7 @@
- 
- 
- VerseKey &SWText::getVerseKey() const {
--	VerseKey *key;
-+	VerseKey *key = NULL;
- 	// see if we have a VerseKey * or decendant
- 	SWTRY {
- 		key = SWDYNAMIC_CAST(VerseKey, this->key);
-Index: sword-1.5.9/src/modules/comments/rawfiles/rawfiles.cpp
-===================================================================
---- sword-1.5.9.orig/src/modules/comments/rawfiles/rawfiles.cpp	2006-11-25 12:40:48.000000000 +0000
-+++ sword-1.5.9/src/modules/comments/rawfiles/rawfiles.cpp	2006-11-25 12:41:09.000000000 +0000
-@@ -57,7 +57,6 @@
- 	FileDesc *datafile;
- 	long  start = 0;
- 	unsigned short size = 0;
--	char *tmpbuf;
- 	VerseKey *key = 0;
- 
- 	SWTRY {
-@@ -155,7 +154,6 @@
- 
- 	long  start;
- 	unsigned short size;
--	char *tmpbuf;
- 	const VerseKey *key = 0;
- 
- 	SWTRY {
diff --git a/debian/patches/07_warn_tools.diff b/debian/patches/07_warn_tools.diff
deleted file mode 100644
index 733a4d0..0000000
--- a/debian/patches/07_warn_tools.diff
+++ /dev/null
@@ -1,193 +0,0 @@
-Index: sword-1.5.9/utilities/cipherraw.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/cipherraw.cpp	2006-11-25 13:18:10.000000000 +0000
-+++ sword-1.5.9/utilities/cipherraw.cpp	2006-11-25 13:18:53.000000000 +0000
-@@ -65,10 +65,10 @@
- 	key.Headings(1);
- 	for (key.Index(0); (!key.Error()); key++) {
- 		rawdrv->findOffset(key.Testament(), key.Index(), &offset, &size);
--		printf("%s: OLD offset: %d; size: %d\n", (const char *)key, offset, size);
-+		printf("%s: OLD offset: %ld; size: %d\n", (const char *)key, offset, size);
- 
- 		if ((offset == loffset) && (size == lsize)) {
--			printf("using previous offset,size\n", size);
-+			printf("using previous offset,size %d\n", size);
- 			offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
- 			printf("%ld %ld %d \n", offset, lzoffset, lzsize);
- 			write(oxfd[key.Testament() - 1], &lzoffset, 4);
-Index: sword-1.5.9/utilities/diatheke/osiscgi.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/diatheke/osiscgi.cpp	2006-11-25 13:09:51.000000000 +0000
-+++ sword-1.5.9/utilities/diatheke/osiscgi.cpp	2006-11-25 13:11:07.000000000 +0000
-@@ -80,17 +80,17 @@
- 
- 				const char *attrib;
- 				const char *val;
--				if (attrib = tag.getAttribute("xlit")) {
-+				if ((attrib = tag.getAttribute("xlit"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					buf.appendFormatted(" %s", val);
- 				}
--				if (attrib = tag.getAttribute("gloss")) {
-+				if ((attrib = tag.getAttribute("gloss"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					buf.appendFormatted(" %s", val);
- 				}
--				if (attrib = tag.getAttribute("lemma")) {
-+				if ((attrib = tag.getAttribute("lemma"))) {
- 					int count = tag.getAttributePartCount("lemma");
- 					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
- 					do {
-@@ -140,7 +140,7 @@
- 						} while (++i < count);
- 					}
- 				}
--				if (attrib = tag.getAttribute("POS")) {
-+				if ((attrib = tag.getAttribute("POS"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					buf.appendFormatted(" %s", val);
-@@ -160,7 +160,7 @@
- 					if (type != "x-strongsMarkup" &&	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
- 					    type != "strongsMarkup") {	// deprecated
- 						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
--						VerseKey *vkey;
-+						VerseKey *vkey = NULL;
- 						// see if we have a VerseKey * or descendant
- 						SWTRY {
- 							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
-@@ -201,7 +201,7 @@
- 
- 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
- 			        buf += "<a href=\"!DIATHEKE_URL!verse=";
--				if (attrib = tag.getAttribute("osisRef")) {
-+				if ((attrib = tag.getAttribute("osisRef"))) {
- 					val = strchr(attrib, ':');
- 					val = (val) ? (val + 1) : attrib;
- 					buf.appendFormatted("%s", val);
-Index: sword-1.5.9/utilities/gbfidx.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/gbfidx.cpp	2006-11-25 13:19:07.000000000 +0000
-+++ sword-1.5.9/utilities/gbfidx.cpp	2006-11-25 13:21:06.000000000 +0000
-@@ -32,12 +32,12 @@
- char testmnt;
- 
- 
--main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- 	long pos, offset;
--	int num1, num2, rangemax, curbook = 0, curchap = 0, curverse = 0;
--	char buf[127], startflag = 0;
--	short size, tmp;
-+	int num1, num2, rangemax;
-+	char startflag = 0;
-+	short size;
- 
- 	checkparams(argc, argv);
- 
-@@ -90,6 +90,7 @@
- 	close(cfp);
- 	close(bfp);
- 	close(fp);
-+	return 0;
- }
- 
- 
-@@ -135,8 +136,6 @@
- 
- char startchap(char *buf)
- {
--	char loop;
--
- 	if (buf[0] != '<')
- 		return 0;
- 	if (buf[1] != 'S')
-@@ -159,8 +158,6 @@
- 
- char startentry(char *buf)
- {
--	char loop;
--
- 	if (buf[0] != '<')
- 		return 0;
- 	if (buf[1] != 'S')
-@@ -184,9 +181,7 @@
- char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
- {
- 	char buf[7];
--	char buf2[20];
--	char ch;
--	char loop;
-+	int loop;
- 	long offset2;
- 	int ch2, vs2, rm2;
- 	bool flag;
-Index: sword-1.5.9/utilities/imp2ld.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/imp2ld.cpp	2006-11-25 13:14:54.000000000 +0000
-+++ sword-1.5.9/utilities/imp2ld.cpp	2006-11-25 13:17:57.000000000 +0000
-@@ -61,9 +61,9 @@
-     }
-   }
- 
--  zLD* modZ;
--  RawLD* mod2;
--  RawLD4* mod4;
-+  zLD* modZ = NULL;
-+  RawLD* mod2 = NULL;
-+  RawLD4* mod4 = NULL;
-   SWKey* key;
- 
-   if (mode == 3) {
-Index: sword-1.5.9/utilities/imp2vs.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/imp2vs.cpp	2006-11-25 13:12:04.000000000 +0000
-+++ sword-1.5.9/utilities/imp2vs.cpp	2006-11-25 13:12:11.000000000 +0000
-@@ -23,7 +23,6 @@
-   
-   const string helptext ="imp2vs 1.0 Bible/Commentary module creation tool for the SWORD Project\n  usage:\n   %s <filename> [output dir] \n";
-   
--  signed long i = 0;
-   string keybuffer = "";
-   string entbuffer = "";
-   string linebuffer = "";
-Index: sword-1.5.9/utilities/osis2mod.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/osis2mod.cpp	2006-11-25 13:11:29.000000000 +0000
-+++ sword-1.5.9/utilities/osis2mod.cpp	2006-11-25 13:11:46.000000000 +0000
-@@ -165,8 +165,8 @@
- 	static bool inChapterHeader = false;
- 
- 	// Flags to indicate whether we are in a book, chapter and/or verse
--	static bool inBook = false;
--	static bool inChapter = false;
-+	//static bool inBook = false;
-+	//static bool inChapter = false;
- 	static bool inVerse = true;
- 
- 	static SWBuf header = "";
-Index: sword-1.5.9/utilities/xml2gbs.cpp
-===================================================================
---- sword-1.5.9.orig/utilities/xml2gbs.cpp	2006-11-25 13:12:24.000000000 +0000
-+++ sword-1.5.9/utilities/xml2gbs.cpp	2006-11-25 13:14:05.000000000 +0000
-@@ -73,7 +73,7 @@
-   }
- 
-   TreeKeyIdx * treeKey;
--  RawGenBook * book;
-+  RawGenBook * book = NULL;
- 
-   std::string divs[32];
- 
-@@ -288,7 +288,7 @@
- }
- 
- int main(int argc, char **argv) {
--  unsigned long i = 0;
-+  int i = 0;
- 
-   char modname[256];
-   *modname = 0;
diff --git a/debian/patches/08_gcc_43.diff b/debian/patches/08_gcc_43.diff
deleted file mode 100644
index 3bfa6bd..0000000
--- a/debian/patches/08_gcc_43.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- sword-1.5.9.orig/include/flatapi.h	2007-04-04 11:52:31.000000000 +0000
-+++ sword-1.5.9/include/flatapi.h	2007-04-04 11:53:30.000000000 +0000
-@@ -27,6 +27,8 @@
- #ifdef __cplusplus
- #endif
- 
-+#include <stdint.h>
-+
- extern "C" {
- 
- #define SWHANDLE intptr_t
---- sword-1.5.9.orig/src/modules/filters/gbfwordjs.cpp	2007-04-04 11:49:30.000000000 +0000
-+++ sword-1.5.9/src/modules/filters/gbfwordjs.cpp	2007-04-04 11:49:45.000000000 +0000
-@@ -8,6 +8,7 @@
- #include <stdlib.h>
- #include <gbfwordjs.h>
- #include <swmodule.h>
-+#include <stdio.h>
- #include <ctype.h>
- #include <utilstr.h>
- #include <versekey.h>
---- sword-1.5.9.orig/utilities/diatheke/corediatheke.h	2007-04-04 11:54:34.000000000 +0000
-+++ sword-1.5.9/utilities/diatheke/corediatheke.h	2007-04-04 11:54:42.000000000 +0000
-@@ -4,6 +4,7 @@
- // see accompanying LICENSE file for license details
- 
- #include <stdio.h>
-+#include <ostream>
- 
- #include "diathekemgr.h"
- #include <localemgr.h>
---- sword-1.5.9.orig/utilities/diatheke/osiscgi.cpp	2007-04-04 11:56:04.000000000 +0000
-+++ sword-1.5.9/utilities/diatheke/osiscgi.cpp	2007-04-04 11:56:16.000000000 +0000
-@@ -14,6 +14,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cctype>
- #include <stdlib.h>
- #include "osiscgi.h"
- #include <utilxml.h>
---- sword-1.5.9.orig/utilities/stepdump.cpp	2007-04-04 12:01:41.000000000 +0000
-+++ sword-1.5.9/utilities/stepdump.cpp	2007-04-04 12:01:49.000000000 +0000
-@@ -1,3 +1,4 @@
-+#include <cstdlib>
- #include <iostream>
- #include <string>
- 
---- sword-1.5.9.orig/utilities/step2vpl.cpp	2007-04-04 12:02:47.000000000 +0000
-+++ sword-1.5.9/utilities/step2vpl.cpp	2007-04-04 12:02:52.000000000 +0000
-@@ -1,3 +1,4 @@
-+#include <cstdlib>
- #include <iostream>
- #include <string>
- #include <stdio.h>
-
-
-diff -urNad sword-1.5.9.orig/utilities/step2vpl.cpp sword-1.5.9/utilities/step2vpl.cpp
---- sword-1.5.9.orig/utilities/step2vpl.cpp	2008-04-10 02:11:24.000000000 +0100
-+++ sword-1.5.9/utilities/step2vpl.cpp	2008-04-10 02:14:03.000000000 +0100
-@@ -1,5 +1,6 @@
- #include <iostream>
- #include <string>
-+#include <cstring>
- #include <stdio.h>
- 
- #include <fcntl.h>
-diff -urNad sword-1.5.9.orig/utilities/stepdump.cpp sword-1.5.9/utilities/stepdump.cpp
---- sword-1.5.9.orig/utilities/stepdump.cpp	2008-04-10 02:11:24.000000000 +0100
-+++ sword-1.5.9/utilities/stepdump.cpp	2008-04-10 02:12:49.000000000 +0100
-@@ -1,5 +1,6 @@
- #include <iostream>
- #include <string>
-+#include <cstring>
- 
- #include <fcntl.h>
- 
diff --git a/debian/patches/09_pcfile.diff b/debian/patches/09_pcfile.diff
deleted file mode 100644
index ed48404..0000000
--- a/debian/patches/09_pcfile.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-don't link frontends against libs unneccessarily
-Index: sword-1.5.9/sword.pc.in
-===================================================================
---- sword-1.5.9.orig/sword.pc.in	2007-08-31 19:21:59.000000000 +0100
-+++ sword-1.5.9/sword.pc.in	2007-08-31 19:22:09.000000000 +0100
-@@ -7,6 +7,6 @@
- Name: SWORD
- Description: Biblical Text Engine
- Version: @VERSION@
--Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
-+Libs: -L${libdir} -lsword
- Cflags: -I${includedir}/sword
- 
diff --git a/debian/patches/11_regex_only_when_needed.diff b/debian/patches/11_regex_only_when_needed.diff
new file mode 100644
index 0000000..d60d3f7
--- /dev/null
+++ b/debian/patches/11_regex_only_when_needed.diff
@@ -0,0 +1,133 @@
+Only use included regex library when building for MINGW.
+Index: main/include/Makefile.am
+===================================================================
+--- main.orig/include/Makefile.am	2009-05-24 18:25:38.000000000 -0700
++++ main/include/Makefile.am	2009-05-24 18:25:57.000000000 -0700
+@@ -76,7 +76,9 @@
+ pkginclude_HEADERS += $(swincludedir)/rawstr4.h
+ pkginclude_HEADERS += $(swincludedir)/rawtext.h
+ pkginclude_HEADERS += $(swincludedir)/rawverse.h
++if MINGW
+ pkginclude_HEADERS += $(swincludedir)/regex.h
++endif
+ pkginclude_HEADERS += $(swincludedir)/roman.h
+ pkginclude_HEADERS += $(swincludedir)/rtfhtml.h
+ pkginclude_HEADERS += $(swincludedir)/sapphire.h
+Index: main/lib/Makefile.in
+===================================================================
+--- main.orig/lib/Makefile.in	2009-05-24 18:28:58.000000000 -0700
++++ main/lib/Makefile.in	2009-05-24 18:29:58.000000000 -0700
+@@ -34,7 +34,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-DIST_COMMON = README $(pkginclude_HEADERS) \
++DIST_COMMON = README $(am__pkginclude_HEADERS_DIST) \
+ 	$(srcdir)/../include/Makefile.am \
+ 	$(srcdir)/../src/frontend/Makefile.am \
+ 	$(srcdir)/../src/keys/Makefile.am \
+@@ -61,6 +61,7 @@
+ 	$(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
+ @HAVE_VSNPRINTF_FALSE@am__append_1 = -DNO_VSNPRINTF
++@MINGW_TRUE@am__append_2 = $(swincludedir)/regex.h
+ subdir = lib
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+@@ -238,6 +239,86 @@
+ 	$(LDFLAGS) -o $@
+ SOURCES = $(libsword_la_SOURCES)
+ DIST_SOURCES = $(am__libsword_la_SOURCES_DIST)
++am__pkginclude_HEADERS_DIST = $(swincludedir)/Greek2Greek.h \
++	$(swincludedir)/GreekChars.h $(swincludedir)/canon.h \
++	$(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \
++	$(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \
++	$(swincludedir)/defs.h $(swincludedir)/echomod.h \
++	$(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \
++	$(swincludedir)/femain.h $(swincludedir)/filemgr.h \
++	$(swincludedir)/versemgr.h $(swincludedir)/flatapi.h \
++	$(swincludedir)/ftpparse.h $(swincludedir)/ftptrans.h \
++	$(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \
++	$(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \
++	$(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h \
++	$(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \
++	$(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \
++	$(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \
++	$(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \
++	$(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h \
++	$(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h \
++	$(swincludedir)/installmgr.h $(swincludedir)/latin1utf16.h \
++	$(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h \
++	$(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h \
++	$(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h \
++	$(swincludedir)/nullim.h $(swincludedir)/osisheadings.h \
++	$(swincludedir)/osishtmlhref.h $(swincludedir)/osiswebif.h \
++	$(swincludedir)/osismorph.h \
++	$(swincludedir)/osismorphsegmentation.h \
++	$(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \
++	$(swincludedir)/osisosis.h $(swincludedir)/osisstrongs.h \
++	$(swincludedir)/osisfootnotes.h $(swincludedir)/osislemma.h \
++	$(swincludedir)/osisredletterwords.h \
++	$(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \
++	$(swincludedir)/osisvariants.h $(swincludedir)/papyriplain.h \
++	$(swincludedir)/plainfootnotes.h $(swincludedir)/plainhtml.h \
++	$(swincludedir)/rawcom.h $(swincludedir)/rawfiles.h \
++	$(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \
++	$(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \
++	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
++	$(swincludedir)/rawverse.h $(swincludedir)/regex.h \
++	$(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \
++	$(swincludedir)/sapphire.h $(swincludedir)/strkey.h \
++	$(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \
++	$(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \
++	$(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \
++	$(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \
++	$(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \
++	$(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \
++	$(swincludedir)/swkey.h $(swincludedir)/swld.h \
++	$(swincludedir)/swlocale.h $(swincludedir)/swlog.h \
++	$(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \
++	$(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \
++	$(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \
++	$(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \
++	$(swincludedir)/swunicod.h $(swincludedir)/swversion.h \
++	$(swincludedir)/sysdata.h $(swincludedir)/thmlfootnotes.h \
++	$(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h \
++	$(swincludedir)/thmlhtml.h $(swincludedir)/thmlhtmlhref.h \
++	$(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \
++	$(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \
++	$(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \
++	$(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \
++	$(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \
++	$(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \
++	$(swincludedir)/teihtmlhref.h $(swincludedir)/treekey.h \
++	$(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h \
++	$(swincludedir)/url.h $(swincludedir)/untgz.h \
++	$(swincludedir)/utf16utf8.h $(swincludedir)/utf8arshaping.h \
++	$(swincludedir)/utf8bidireorder.h \
++	$(swincludedir)/utf8cantillation.h \
++	$(swincludedir)/utf8greekaccents.h \
++	$(swincludedir)/utf8hebrewpoints.h \
++	$(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \
++	$(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \
++	$(swincludedir)/utf8nfkd.h \
++	$(swincludedir)/utf8transliterator.h \
++	$(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \
++	$(swincludedir)/utilxml.h $(swincludedir)/versekey.h \
++	$(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \
++	$(swincludedir)/zconf.h $(swincludedir)/zipcomprs.h \
++	$(swincludedir)/zld.h $(swincludedir)/zstr.h \
++	$(swincludedir)/ztext.h $(swincludedir)/zverse.h
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -575,7 +656,7 @@
+ 	$(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \
+ 	$(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \
+ 	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
+-	$(swincludedir)/rawverse.h $(swincludedir)/regex.h \
++	$(swincludedir)/rawverse.h $(am__append_2) \
+ 	$(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \
+ 	$(swincludedir)/sapphire.h $(swincludedir)/strkey.h \
+ 	$(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \
+
diff --git a/debian/patches/12_fix_compiler_warnings.diff b/debian/patches/12_fix_compiler_warnings.diff
new file mode 100644
index 0000000..b095eca
--- /dev/null
+++ b/debian/patches/12_fix_compiler_warnings.diff
@@ -0,0 +1,1197 @@
+Remove compiler warnings so SWORD will compile with -Wall -Werror
+Index: main/src/mgr/filemgr.cpp
+===================================================================
+--- main.orig/src/mgr/filemgr.cpp	2009-05-25 14:52:54.000000000 -0700
++++ main/src/mgr/filemgr.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -273,8 +273,7 @@
+ 		file->seek(0, SEEK_SET);
+ 		while (size > 0) {	 
+ 			bytes = file->read(nibble, 32767);
+-			write(fd, nibble, (bytes < size)?bytes:size);
+-			size -= bytes;
++			size -= write(fd, nibble, (bytes < size)?bytes:size);
+ 		}
+ 		// zero out the file
+ 		::close(file->fd);
+@@ -396,7 +395,7 @@
+ 
+ 
+ int FileMgr::copyFile(const char *sourceFile, const char *targetFile) {
+-	int sfd, dfd, len;
++  int sfd, dfd, len, written;
+ 	char buf[4096];
+ 
+ 	if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1)
+@@ -406,7 +405,7 @@
+ 
+ 	do {
+ 		len = read(sfd, buf, 4096);
+-		write(dfd, buf, len);
++		written = write(dfd, buf, len);
+ 	}
+ 	while(len == 4096);	
+ 	::close(dfd);
+Index: main/src/utilfuns/zlib/untgz.c
+===================================================================
+--- main.orig/src/utilfuns/zlib/untgz.c	2009-05-25 14:52:54.000000000 -0700
++++ main/src/utilfuns/zlib/untgz.c	2009-05-25 14:52:57.000000000 -0700
+@@ -13,6 +13,8 @@
+ #include <fcntl.h>
+ #ifdef unix
+ # include <unistd.h>
++# include <sys/stat.h>
++# include <sys/types.h>
+ #else
+ # include <direct.h>
+ # include <io.h>
+@@ -80,7 +82,7 @@
+ 
+ enum { TGZ_EXTRACT = 0, TGZ_LIST };
+ 
+-static char *TGZfname	OF((const char *));
++// static char *TGZfname	OF((const char *));
+ void TGZnotfound	OF((const char *));
+ 
+ int getoct		OF((char *, int));
+@@ -105,22 +107,23 @@
+ /* Return the real name of the TGZ archive */
+ /* or NULL if it does not exist. */
+ 
+-static char *TGZfname OF((const char *fname))
+-{
+-  static char buffer[1024];
+-  int origlen,i;
+-  
+-  strcpy(buffer,fname);
+-  origlen = strlen(buffer);
+-
+-  for (i=0; TGZprefix[i]; i++)
+-    {
+-       strcpy(buffer+origlen,TGZprefix[i]);
+-       if (access(buffer,F_OK) == 0)
+-         return buffer;
+-    }
+-  return NULL;
+-}
++// COMMENTED OUT 20090516 for SWORD
++// static char *TGZfname OF((const char *fname))
++// {
++//   static char buffer[1024];
++//   int origlen,i;
++//
++//   strcpy(buffer,fname);
++//   origlen = strlen(buffer);
++//
++//   for (i=0; TGZprefix[i]; i++)
++//     {
++//        strcpy(buffer+origlen,TGZprefix[i]);
++//        if (access(buffer,F_OK) == 0)
++//          return buffer;
++//     }
++//   return NULL;
++// }
+ 
+ /* error message for the filename */
+ 
+Index: main/tests/testblocks.cpp
+===================================================================
+--- main.orig/tests/testblocks.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/tests/testblocks.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -29,14 +29,18 @@
+ void addEntry(EntriesBlock *eb) {
+ 	string input;
+ 	string body;
+-	char line[1024];
++	char line[1024], *c;
+ 	std::cout << "\nEnter new Entry's text. '.' on an empty line to finish:\n";
+ 	do {
+ 		std::cout << "> ";
+-		fgets(line, 1000, stdin);
+-		input = line;
+-		if (input.compare("."))
+-			body.append(input);
++		c = fgets(line, 1000, stdin);
++		if (c == NULL) {
++			std::cerr << "ERROR: fgets failed during addEntry\n";
++		} else {
++			input = line;
++			if (input.compare("."))
++				body.append(input);
++		}
+ 	}
+ 	while (input.compare("."));
+ 	std::cout << "Adding new entry.  Index is: " << eb->addEntry(body.c_str()) << "\n\n";
+@@ -72,29 +76,33 @@
+ 
+ 	EntriesBlock *eb = new EntriesBlock();
+ 	string input;
+-	char line[1024];
++	char line[1024], *c;
+ 
+ 	std::cout << "Initial entry count should be 0: " << eb->getCount() << "\n";
+ 
+ 	do {
+ 		std::cout << "[" << eb->getCount() << "] > ";
+-		fgets(line, 1000, stdin);
+-		input = line;
+-		if (input.length() > 0) {
+-			switch (input[0]) {
+-				case 'a': addEntry(eb); break;
+-				case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
+-				case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
+-				case 's': printSize(eb); break;
+-				case 'q': break;
+-				case '?':
+-				default:
+-					std::cout << "\n a - add a new entry\n";
+-					std::cout << " p <entry_index> - print entry\n";
+-					std::cout << " r <entry_index> - remove entry\n";
+-					std::cout << " s - print size of raw data\n";
+-					std::cout << " q - quit\n\n";
+-					break;
++		c = fgets(line, 1000, stdin);
++		if (c == NULL) {
++			std::cerr << "ERROR: fgets failed in main\n";
++		} else {
++			input = line;
++			if (input.length() > 0) {
++				switch (input[0]) {
++					case 'a': addEntry(eb); break;
++					case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
++					case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
++					case 's': printSize(eb); break;
++					case 'q': break;
++					case '?':
++					default:
++						std::cout << "\n a - add a new entry\n";
++						std::cout << " p <entry_index> - print entry\n";
++						std::cout << " r <entry_index> - remove entry\n";
++						std::cout << " s - print size of raw data\n";
++						std::cout << " q - quit\n\n";
++						break;
++				}
+ 			}
+ 		}
+ 	}
+Index: main/utilities/stepdump.cpp
+===================================================================
+--- main.orig/utilities/stepdump.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/stepdump.cpp	2009-05-25 14:53:05.000000000 -0700
+@@ -151,33 +151,56 @@
+ 
+ 
+ void readVersion(int fd, Version *versionRecord) {
++	int r;
+ 
+ 	cout << "\n\nReading Version Record (" << 16/*sizeof(struct Version)*/ << " bytes)\n\n";
+ // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+ //	read(fd, &versionRecord, sizeof(struct Version));
+ 
+ 	cout << "Version Record Information\n";
+-	read(fd, &(versionRecord->versionRecordSize), 2);
++	r = read(fd, &(versionRecord->versionRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tversionRecordSize: " << versionRecord->versionRecordSize << "\n";
+-	read(fd, &(versionRecord->publisherID), 2);
++	r = read(fd, &(versionRecord->publisherID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tpublisherID: " << versionRecord->publisherID << "\n";
+-	read(fd, &(versionRecord->bookID), 2);
++	r = read(fd, &(versionRecord->bookID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tbookID: " << versionRecord->bookID << "\n";
+-	read(fd, &(versionRecord->setID), 2);
++	r = read(fd, &(versionRecord->setID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tsetID: " << versionRecord->setID << "\n";
+-	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
++	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tconversionProgramVerMajor: " << (int)versionRecord->conversionProgramVerMajor << "\n";
+-	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
++	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tconversionProgramVerMinor: " << (int)versionRecord->conversionProgramVerMinor << "\n";
+-	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tleastCompatSTEPVerMajor: " << (int)versionRecord->leastCompatSTEPVerMajor << "\n";
+-	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tleastCompatSTEPVerMinor: " << (int)versionRecord->leastCompatSTEPVerMinor << "\n";
+-	read(fd, &(versionRecord->encryptionType), 1);
++	r = read(fd, &(versionRecord->encryptionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tencryptionType: " << (int)versionRecord->encryptionType << "\n";
+-	read(fd, &(versionRecord->editionID), 1);
++	r = read(fd, &(versionRecord->editionID), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\teditionID: " << (int)versionRecord->editionID << "\n";
+-	read(fd, &(versionRecord->modifiedBy), 2);
++	r = read(fd, &(versionRecord->modifiedBy), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n";
+ 
+ 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+@@ -185,33 +208,49 @@
+ 	if (skip) {
+ 		cout << "\nSkipping " << skip << " unknown bytes.\n";
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readVersion");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
+-
++	int r;
+ 	cout << "\n\nReading Viewable Header Record (" << 16/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+ 
+ // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+ //	read(fd, &viewableHeaderRecord, sizeof(struct ViewableHeader));
+ 
+ 	cout << "Viewable Header Record Information\n";
+-	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
++	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tviewableHeaderRecordSize: " << viewableHeaderRecord->viewableHeaderRecordSize << "\n";
+-	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
++	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tviewableBlocksCount: " << viewableHeaderRecord->viewableBlocksCount << "\n";
+-	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
++	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tglossBlocksCount: " << viewableHeaderRecord->glossBlocksCount << "\n";
+-	read(fd, &(viewableHeaderRecord->compressionType), 1);
++	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tcompressionType: " << (int)viewableHeaderRecord->compressionType << "(0 - none; 1 - LZSS)\n";
+-	read(fd, &(viewableHeaderRecord->reserved1), 1);
++	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\treserved1: " << (int)viewableHeaderRecord->reserved1 << "\n";
+-	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
++	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tblockEntriesSize: " << viewableHeaderRecord->blockEntriesSize << "\n";
+-	read(fd, &(viewableHeaderRecord->reserved2), 2);
++	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n";
+ 
+ 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+@@ -219,18 +258,23 @@
+ 	if (skip) {
+ 		cout << "\nSkipping " << skip << " unknown bytes.\n";
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readViewableHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
++	int r;
+ 	unsigned long size = vb->size;
+ 
+ 	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+ 	lseek(fd, vb->offset, SEEK_SET);
+-	read(fd, *buf, vb->size);
++	r = read(fd, *buf, vb->size);
++	if (r != vb->size)
++		perror("ERROR: read failed in readViewableBlocktext");
+ 
+ 	compress->zBuf(&size, *buf);
+ 	strcpy(*buf, compress->Buf());
+@@ -240,30 +284,41 @@
+ 
+ 
+ void readViewableBlock(int fd, ViewableBlock *vb) {
+-
++	int r;
+ 	cout << "\n\nReading Viewable Block (" << 12/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+ 
+ // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+ //	read(fd, &vb, sizeof(struct ViewableBlock));
+ 
+ 	cout << "Viewable Block Information\n";
+-	read(fd, &(vb->offset), 4);
++	r = read(fd, &(vb->offset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ 	cout << "\toffset: " << vb->offset << "\n";
+-	read(fd, &(vb->uncompressedSize), 4);
++	r = read(fd, &(vb->uncompressedSize), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ 	cout << "\tuncompressedSize: " << vb->uncompressedSize << "\n";
+-	read(fd, &(vb->size), 4);
++	r = read(fd, &(vb->size), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ 	cout << "\tsize: " << vb->size << "\n";
+ }
+ 
+ 
+ void readHeaderControlWordAreaText(int fd, char **buf) {
++	int r;
+ 	long headerControlWordAreaSize;
+-	read(fd, &headerControlWordAreaSize, 4);
++	r = read(fd, &headerControlWordAreaSize, 4);
++	if (r != 4)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 	cout << "Reading Header Control Word Area (" << headerControlWordAreaSize << " bytes)\n\n";
+ 
+ 	*buf = new char [headerControlWordAreaSize + 1];
+ 
+-	read(fd, *buf, headerControlWordAreaSize);
++	r = read(fd, *buf, headerControlWordAreaSize);
++	if (r != headerControlWordAreaSize)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 	(*buf)[headerControlWordAreaSize] = 0;
+ 
+ 	cout << "headerControlWordArea:\n" << *buf << "\n";
+Index: main/utilities/treeidxutil.cpp
+===================================================================
+--- main.orig/utilities/treeidxutil.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/treeidxutil.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -49,27 +49,33 @@
+ 
+ 
+ void setLocalName(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Node Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in setLocalName\n";
+ 	treeKey->setLocalName(buf);
+ 	treeKey->save();
+ }
+ 
+ 
+ void assurePath(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter path: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in assurePath\n";
+ 	treeKey->assureKeyPath(buf);
+ }
+ 
+ 
+ void appendSibbling(TreeKeyIdx *treeKey) {
+ 	if (treeKey->getOffset()) {
+-		char buf[1023];
++	  char buf[1023], *c;
+ 		std::cout << "Enter New Sibbling Name: ";
+-		fgets(buf, 1000, stdin);
++		c = fgets(buf, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in appendSibbling\n";
+ 		treeKey->append();
+ 		treeKey->setLocalName(buf);
+ 		treeKey->save();
+@@ -79,9 +85,11 @@
+ 
+ 
+ void appendChild(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Child Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in appendChild\n";
+ 	treeKey->appendChild();
+ 	treeKey->setLocalName(buf);
+ 	treeKey->save();
+@@ -114,11 +122,13 @@
+ 	TreeKeyIdx root = *treeKey;
+ 
+ 	std::string input;
+-	char line[1024];
++	char line[1024], *c;
+ 
+ 	do {
+ 		std::cout << "[" << treeKey->getText() << "] > ";
+-		fgets(line, 1000, stdin);
++		c = fgets(line, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in main\n";
+ 		input = line;
+ 		if (input.length() > 0) {
+ 			switch (input[0]) {
+Index: main/utilities/gbfidx.cpp
+===================================================================
+--- main.orig/utilities/gbfidx.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/gbfidx.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -53,7 +53,7 @@
+ int main(int argc, char **argv)
+ {
+ 	long pos, offset;
+-	int num1, num2, rangemax;
++	int num1, num2, rangemax, w;
+ 	char startflag = 0;
+ 	short size;
+ 
+@@ -65,18 +65,30 @@
+ 	num1 = key1.Chapter();
+ 	num2 = key1.Verse();
+ 	pos  = 0;
+-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
++	w = write(bfp, &pos, 4);  /* Book    offset for testament intros */
++	if (w != 4)
++		perror("ERROR: write failed in main");
+ 	pos = 4;
+-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
++	w = write(cfp, &pos, 4);  /* Chapter offset for testament intro */
++	if (w != 4)
++		perror("ERROR: write failed in main");
+ 
+ 
+ /*	Right now just zero out intros until parsing correctly */
+ 	pos = 0;
+ 	size = 0;
+-	write(vfp, &pos, 4);  /* Module intro */
+-	write(vfp, &size, 2);
+-	write(vfp, &pos, 4);  /* Testament intro */
+-	write(vfp, &size, 2);
++	w = write(vfp, &pos, 4);  /* Module intro */
++	if (w != 4)
++		perror("ERROR: write failed in main");
++	w = write(vfp, &size, 2);
++	if (w != 2)
++		perror("ERROR: write failed in main");
++	w = write(vfp, &pos, 4);  /* Testament intro */
++	if (w != 4)
++		perror("ERROR: write failed in main");
++	w = write(vfp, &size, 2);
++	if (w != 2)
++		perror("ERROR: write failed in main");
+ 
+ 	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
+ 		if (!startflag) {
+@@ -120,6 +132,7 @@
+ 
+ void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
+ {
++	int w;
+ 	long pos;
+ 	short tmp;
+ 
+@@ -127,26 +140,48 @@
+ 		if (key1.Verse() == 1) {	// new chapter
+ 			if (key1.Chapter() == 1) {	// new book
+ 				pos = lseek(cfp, 0, SEEK_CUR);
+-				write(bfp, &pos, 4);
++				w = write(bfp, &pos, 4);
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
+ 				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
+-				write(cfp, &pos, 4);
+-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
+-				write(vfp, &chapsize, 2);
++				w = write(cfp, &pos, 4);
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
++				w = write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
++				w = write(vfp, &chapsize, 2);
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
+ 			}
+ 			pos = lseek(vfp, 0, SEEK_CUR);
+-			write(cfp, &pos, 4);
+-			write(vfp, &chapoffset, 4);  /* Chapter intro */
+-			write(vfp, &chapsize, 2);
++			w = write(cfp, &pos, 4);
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &chapoffset, 4);  /* Chapter intro */
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &chapsize, 2);
++			if (w != 2)
++				perror("ERROR: write failed in writeidx");
+ 		}
+ 		if (key1 >= key2) {
+-			write(vfp, &offset, 4);
+-			write(vfp, &size, 2);
++			w = write(vfp, &offset, 4);
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &size, 2);
++			if (w != 2)
++				perror("ERROR: write failed in writeidx");
+ 		}
+ 		else	{
+ 			pos = 0;
+ 			tmp = 0;
+-			write(vfp, &pos, 4);
+-			write(vfp, &tmp, 2);
++			w = write(vfp, &pos, 4);
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &tmp, 2);
++			if (w != 2)
++				perror("ERROR: write failed in writeidx");
+ 		}
+ 	}
+ }
+Index: main/utilities/genbookutil.cpp
+===================================================================
+--- main.orig/utilities/genbookutil.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/genbookutil.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -48,9 +48,11 @@
+ 
+ 
+ void setLocalName(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Node Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in setLocalName\n";
+ 	SWBuf name = buf;
+ 	treeKey->setLocalName(name.trim());
+ 	treeKey->save();
+@@ -58,18 +60,22 @@
+ 
+ 
+ void gotoPath(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter Path: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in gotoPath\n";
+ 	SWBuf path = buf;
+ 	(*treeKey) = path.trim();
+ }
+ 
+ 
+ void assurePath(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter Path: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in assurePath\n";
+ 	SWBuf path = buf;
+ 	treeKey->assureKeyPath(path.trim());
+ }
+@@ -86,10 +92,12 @@
+ 	SWBuf body;
+ 	TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+ 	if (treeKey->getOffset()) {
+-		char buf[1023];
++	  char buf[1023], *c;
+ 		std::cout << "Enter New Entry Text ('.' on a line by itself to end): \n";
+ 		do {
+-			fgets(buf, 1000, stdin);
++			c = fgets(buf, 1000, stdin);
++			if (c == NULL)
++				std::cerr << "ERROR: fgets failed in setEntryText\n";
+ 			SWBuf text = buf;
+ 			text.trim();
+ 			if ((text[0] == '.') && (text[1] == 0))
+@@ -106,9 +114,11 @@
+ 
+ void appendSibbling(TreeKeyIdx *treeKey) {
+ 	if (treeKey->getOffset()) {
+-		char buf[1023];
++	  char buf[1023], *c;
+ 		std::cout << "Enter New Sibbling Name: ";
+-		fgets(buf, 1000, stdin);
++		c = fgets(buf, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in appendSibbling\n";
+ 		SWBuf name = buf;
+ 		treeKey->append();
+ 		treeKey->setLocalName(name.trim());
+@@ -119,9 +129,11 @@
+ 
+ 
+ void appendChild(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Child Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in appendChild\n";
+ 	SWBuf name = buf;
+ 	treeKey->appendChild();
+ 	treeKey->setLocalName(name.trim());
+@@ -163,11 +175,13 @@
+ 	treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+ 
+ 	SWBuf input;
+-	char line[1024];
++	char line[1024], *c;
+ 
+ 	do {
+ 		std::cout << "[" << treeKey->getText() << "] > ";
+-		fgets(line, 1000, stdin);
++		c = fgets(line, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in main\n";
+ 		input = line;
+ 		input.trim();
+ 		if (input.length() > 0) {
+Index: main/utilities/vpl2mod.cpp
+===================================================================
+--- main.orig/utilities/vpl2mod.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/vpl2mod.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -67,14 +67,18 @@
+ 			break;
+ 	}
+ 	
+-	int size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
++	int r, size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
+ 
+ 	*buf = new char [ size + 1 ];
+ 
+ 	if (size > 0) {
+ 		lseek(fd, index, SEEK_SET);
+-		read(fd, *buf, size);
+-		read(fd, &ch, 1);   //pop terminating char
++		r = read(fd, *buf, size);
++		if (r != size)
++			std::cerr <<"ERROR: short read in readline\n";
++		r = read(fd, &ch, 1);   //pop terminating char
++		if (r != size)
++			std::cerr <<"ERROR: short read of terminating char in readline\n";
+ 		(*buf)[size] = 0;
+ 
+ 		// clean up any trailing junk on buf
+Index: main/utilities/installmgr.cpp
+===================================================================
+--- main.orig/utilities/installmgr.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/installmgr.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -62,8 +62,10 @@
+ 		cout << "then type yes at the prompt\n\n";
+ 		cout << "enable? [no] ";
+ 
+-		char prompt[10];
+-		fgets(prompt, 9, stdin);
++		char prompt[10], *c;
++		c = fgets(prompt, 9, stdin);
++		if (c == NULL)
++			std::cerr <<"ERROR: fgets failed in isUserDisclaimerConfirmed\n";
+ 		confirmed = (!strcmp(prompt, "yes\n"));
+ 	}
+ 	return confirmed;
+Index: main/utilities/step2vpl.cpp
+===================================================================
+--- main.orig/utilities/step2vpl.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/step2vpl.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -218,93 +218,169 @@
+ 
+ 
+ void readVersion(int fd, Version *versionRecord) {
++	int r;
+ 
+-	read(fd, &(versionRecord->versionRecordSize), 2);
+-	read(fd, &(versionRecord->publisherID), 2);
+-	read(fd, &(versionRecord->bookID), 2);
+-	read(fd, &(versionRecord->setID), 2);
+-	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
+-	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
+-	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
+-	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
+-	read(fd, &(versionRecord->encryptionType), 1);
+-	read(fd, &(versionRecord->editionID), 1);
+-	read(fd, &(versionRecord->modifiedBy), 2);
++	r = read(fd, &(versionRecord->versionRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++
++	r = read(fd, &(versionRecord->publisherID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->bookID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->setID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->encryptionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->editionID), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->modifiedBy), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 
+ 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readVersion");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) {
++	int r;
+ 
+-	read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
+-	read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
+-	read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
+-	read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
+-	read(fd, &(sectionsHeaderRecord->reserved), 4);
++	r = read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->reserved), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionsHeader");
+ 
+ 	int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readSectionsHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
++	int r;
+ 
+-	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
+-	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
+-	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
+-	read(fd, &(viewableHeaderRecord->compressionType), 1);
+-	read(fd, &(viewableHeaderRecord->reserved1), 1);
+-	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
+-	read(fd, &(viewableHeaderRecord->reserved2), 2);
++	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 
+ 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readViewableHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) {
++	int r;
+ 
+-	read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
+-	read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
+-	read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
+-	read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
+-	read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
+-	read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
+-	read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
++	r = read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
+ 
+ 	int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readVSyncHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
++	int r;
+ 	unsigned long size = vb->size;
+ 
+ 	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+ 	lseek(fd, vb->offset, SEEK_SET);
+-	read(fd, *buf, vb->size);
++	r = read(fd, *buf, vb->size);
++	if (r != vb->size)
++		perror("ERROR: read failed in readViewableBlockText");
+ 
+ 	compress->zBuf(&size, *buf);
+ 	strcpy(*buf, compress->Buf());
+@@ -312,35 +388,53 @@
+ 
+ 
+ void readViewableBlock(int fd, ViewableBlock *vb) {
++	int r;
+ 
+-	read(fd, &(vb->offset), 4);
+-	read(fd, &(vb->uncompressedSize), 4);
+-	read(fd, &(vb->size), 4);
++	r = read(fd, &(vb->offset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
++	r = read(fd, &(vb->uncompressedSize), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
++	r = read(fd, &(vb->size), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ }
+ 
+ 
+ void readHeaderControlWordAreaText(int fd, char **buf) {
++	int r;
+ 	long headerControlWordAreaSize;
+-	read(fd, &headerControlWordAreaSize, 4);
++	r = read(fd, &headerControlWordAreaSize, 4);
++	if (r != 4)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 
+ 	*buf = new char [headerControlWordAreaSize + 1];
+ 
+-	read(fd, *buf, headerControlWordAreaSize);
++	r = read(fd, *buf, headerControlWordAreaSize);
++	if (r != headerControlWordAreaSize)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 	(*buf)[headerControlWordAreaSize] = 0;
+ 
+ }
+ 
+ void readVSyncBooksInfo(int fd, VSyncHeader *vSyncHeaderRecord, VSyncBooksInfo **vSyncBooksInfo) {
+ 
++	int r;
+ 	int bookCount = vSyncHeaderRecord->endBookNumber - vSyncHeaderRecord->startBookNumber;
+ 	*vSyncBooksInfo = new VSyncBooksInfo[bookCount];
+ 	for (int i = 0; i <= bookCount; i++) {
+-		read(fd, &(*vSyncBooksInfo)[i].offset, 4);
+-		read(fd, &(*vSyncBooksInfo)[i].count, 2);
++		r = read(fd, &(*vSyncBooksInfo)[i].offset, 4);
++		if (r != 4)
++			perror("ERROR: read failed in readVSyncBooksInfo");
++		r = read(fd, &(*vSyncBooksInfo)[i].count, 2);
++		if (r != 2)
++			perror("ERROR: read failed in readVSyncBooksInfo");
+ 	}
+ }
+ 
+ void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo) {
++	int r;
+ 	VSyncPoint vSyncPoint;
+ 
+ 	lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET);
+@@ -351,9 +445,15 @@
+ 		char *sectionName;
+ 		char *verseText;
+ 
+-		read(fdvsync, &(vSyncPoint.chapter), 2);
+-		read(fdvsync, &(vSyncPoint.verse), 2);
+-		read(fdvsync, &(vSyncPoint.offset), 4);
++		r = read(fdvsync, &(vSyncPoint.chapter), 2);
++		if (r != 2)
++			perror("ERROR: read failed in displayBook");
++		r = read(fdvsync, &(vSyncPoint.verse), 2);
++		if (r != 2)
++			perror("ERROR: read failed in displayBook");
++		r = read(fdvsync, &(vSyncPoint.offset), 4);
++		if (r != 4)
++			perror("ERROR: read failed in displayBook");
+ 		vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE);
+ 		lseek(fdsections, vSyncPoint.offset, SEEK_SET);
+ 		readSectionLevelInfo(fdsections, &sectionLevelInfo);
+@@ -408,26 +508,50 @@
+ 
+ 
+ void readSectionName(int fd, SectionLevelInfo *sli, char **name) {
++	int r;
+ 	short size;
+ 	lseek(fd, sli->nameOffset, SEEK_SET);
+-	read(fd, &size, 2);
++	r = read(fd, &size, 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionName");
+ 	*name = new char [ size + 1 ];
+-	read(fd, *name, size);
++	r = read(fd, *name, size);
++	if (r != size)
++		perror("ERROR: read failed in readSectionName");
+ 	(*name)[size] = 0;
+ }
+ 
+ void readSectionLevelInfo(int fd, SectionLevelInfo *sli) {
++	int r;
+ 
+-	read(fd, &(sli->parentOffset), 4);
+-	read(fd, &(sli->previousOffset), 4);
+-	read(fd, &(sli->nextOffset), 4);
+-	read(fd, &(sli->viewableOffset), 4);
++	r = read(fd, &(sli->parentOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->previousOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->nextOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->viewableOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
+ 	sli->viewableOffset = VIEWABLEBLOCKSTART + (VIEWABLEBLOCKSIZE * sli->viewableOffset);
+-	read(fd, &(sli->startLevel), 2);
+-	read(fd, &(sli->level), 1);
+-	read(fd, &(sli->nameOffset), 4);
+-	read(fd, &(sli->outSync_1), 4);
+-	read(fd, &(sli->outSync_2), 2);
++	r = read(fd, &(sli->startLevel), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->level), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->nameOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->outSync_1), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->outSync_2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionLevelInfo");
+ }
+ 
+ void cleanBuf(char *buf) {
+Index: main/utilities/cipherraw.cpp
+===================================================================
+--- main.orig/utilities/cipherraw.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/cipherraw.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -43,7 +43,7 @@
+ 	SWCipher *zobj;
+ 	VerseKey key;
+ 	RawVerse *rawdrv;
+-	int ofd[2], oxfd[2];
++	int ofd[2], oxfd[2], w;
+ 	long tmpoff = 0, offset, loffset = 0, lzoffset = 0;
+ 	unsigned short size, lsize = 0, lzsize;
+ 	char *tmpbuf;
+@@ -69,10 +69,18 @@
+ 	delete [] tmpbuf;
+ 
+ 	printf("\n");
+-	write(oxfd[0], &lzoffset, 4);
+-	write(oxfd[0], &lzsize, 2);
+-	write(oxfd[1], &lzoffset, 4);
+-	write(oxfd[1], &lzsize, 2);
++	w = write(oxfd[0], &lzoffset, 4);
++	if (w < 0)
++		perror("ERROR: write failed in main");
++	w = write(oxfd[0], &lzsize, 2);
++	if (w < 0)
++		perror("ERROR: write failed in main");
++	w = write(oxfd[1], &lzoffset, 4);
++	if (w < 0)
++		perror("ERROR: write failed in main");
++	w = write(oxfd[1], &lzsize, 2);
++	if (w < 0)
++		perror("ERROR: write failed in main");
+ 
+ 	key.AutoNormalize(0);
+ 	key.Headings(1);
+@@ -84,8 +92,13 @@
+ 			printf("using previous offset,size %d\n", size);
+ 			offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
+ 			printf("%ld %ld %d \n", offset, lzoffset, lzsize);
+-			write(oxfd[key.Testament() - 1], &lzoffset, 4);
+-			write(oxfd[key.Testament() - 1], &lzsize, 2);
++			w = write(oxfd[key.Testament() - 1], &lzoffset, 4);
++			if (w < 0)
++				perror("ERROR: write failed in main");
++
++			w = write(oxfd[key.Testament() - 1], &lzsize, 2);
++			if (w < 0)
++				perror("ERROR: write failed in main");
+ 		}
+ 		else {
+ 			lsize   = size;
+@@ -102,13 +115,23 @@
+ 			offset = lseek(ofd[key.Testament() - 1], 0, SEEK_CUR);
+ 			tmpoff = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
+ 			printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size);
+-			write(oxfd[key.Testament() - 1], &offset, 4);
++			w = write(oxfd[key.Testament() - 1], &offset, 4);
++			if (w < 0)
++				perror("ERROR: write failed in main");
++
+ 			unsigned long ulSize = size;
+-			if (size) 
+-				write(ofd[key.Testament() - 1], zobj->cipherBuf(&ulSize), size);
++			if (size) {
++				w = write(ofd[key.Testament() - 1], zobj->cipherBuf(&ulSize), size);
++				if (w < 0)
++					perror("ERROR: write failed in main");
++			}
++
+ 			size = (unsigned int)ulSize;
+ 			lzoffset = offset;
+-			write(oxfd[key.Testament() - 1], &size, 2);
++			w = write(oxfd[key.Testament() - 1], &size, 2);
++			if (w < 0)
++				perror("ERROR: write failed in main");
++
+ 			lzsize = size;
+ 		}
+ 	}
+Index: main/src/modules/filters/teirtf.cpp
+===================================================================
+--- main.orig/src/modules/filters/teirtf.cpp	2009-05-25 14:52:53.000000000 -0700
++++ main/src/modules/filters/teirtf.cpp	2009-05-25 14:52:57.000000000 -0700
+@@ -159,7 +159,7 @@
+ 					SWBuf type = tag.getAttribute("type");

+ 

+ 					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");

+-					VerseKey *vkey;

++					VerseKey *vkey = NULL;

+ 					// see if we have a VerseKey * or descendant

+ 					SWTRY {

+ 						vkey = SWDYNAMIC_CAST(VerseKey, u->key);

+Index: main/utilities/lexdump.c
+===================================================================
+--- main.orig/utilities/lexdump.c	2009-05-25 14:53:18.000000000 -0700
++++ main/utilities/lexdump.c	2009-05-25 14:54:46.000000000 -0700
+@@ -40,7 +40,7 @@
+ 
+ int main(int argc, char **argv) {
+ 	char *tmpbuf;
+-	int idxfd, datfd;
++	int idxfd, datfd, r;
+ 	long offset;
+ 	unsigned int size;
+ 	char datbuf[255];
+@@ -59,11 +59,17 @@
+ 
+ 	offset = atoi(argv[2]) * 6;
+ 	lseek(idxfd, offset, SEEK_SET);
+-	read(idxfd, &offset, 4);
+-	read(idxfd, &size, 2);
++	r = read(idxfd, &offset, 4);
++	if (r != 4)
++		perror("ERROR: read failed in main");
++	r = read(idxfd, &size, 2);
++	if (r != 2)
++		perror("ERROR: read failed in main");
+ 	printf("offset: %ld; size: %d\n", offset, size);
+ 	lseek(datfd, offset, SEEK_SET);
+-	read(datfd, datbuf, 40);
++	r = read(datfd, datbuf, 40);
++	if (r != 40)
++		perror("ERROR: read failed in main");
+ 	datbuf[40] = 0;
+ 	printf("%s\n", datbuf);
+ 	close(datfd);
diff --git a/debian/patches/13_fix_osis2mod_compression_default.diff b/debian/patches/13_fix_osis2mod_compression_default.diff
new file mode 100644
index 0000000..0fa230e
--- /dev/null
+++ b/debian/patches/13_fix_osis2mod_compression_default.diff
@@ -0,0 +1,15 @@
+Ensure LZSS compression is not accidentally enabled by default.
+This is svn revision 2416 in the upstream SWORD repository.
+Index: main/utilities/osis2mod.cpp
+===================================================================
+--- main.orig/utilities/osis2mod.cpp	2009-05-28 21:59:05.000000000 -0700
++++ main/utilities/osis2mod.cpp	2009-05-28 21:59:33.000000000 -0700
+@@ -1473,7 +1473,7 @@
+         if (compType == "ZIP") {
+                 compressor = new ZipCompress();
+         }
+-        else if (compType = "LZSS") {
++        else if (compType == "LZSS") {
+                 compressor = new LZSSCompress();
+         }
+ 
diff --git a/debian/patches/14_closing_section_not_chapter.diff b/debian/patches/14_closing_section_not_chapter.diff
new file mode 100644
index 0000000..dbdeac5
--- /dev/null
+++ b/debian/patches/14_closing_section_not_chapter.diff
@@ -0,0 +1,95 @@
+Adds changes from upstream svn to fix known issues in osis2mod,
+Index: main/utilities/osis2mod.cpp
+===================================================================
+--- main.orig/utilities/osis2mod.cpp	2009-05-28 22:02:59.000000000 -0700
++++ main/utilities/osis2mod.cpp	2009-05-28 23:05:34.000000000 -0700
+@@ -612,6 +612,12 @@
+ 	// Flag used to indicate where useful text begins
+ 	static bool               firstDiv        = false;
+ 
++	// Retain the sID of book, chapter and verse (commentary) divs so that we can find them again.
++	// This relies on transformBSP.
++	static SWBuf              sidBook         = "";
++	static SWBuf              sidChapter      = "";
++	static SWBuf              sidVerse        = "";
++
+ 	// Stack of quote elements used to handle Words of Christ
+ 	static std::stack<XMLTag> quoteStack;
+ 
+@@ -628,9 +634,10 @@
+ 	static int                verseDepth      = 0;
+ 
+ 	int                       tagDepth        = tagStack.size();
+-	const char               *tokenName       = token.getName();
++	SWBuf                     tokenName       = token.getName();
+ 	bool                      isEndTag        = token.isEndTag() || token.getAttribute("eID");
+-	const char               *typeAttr        = token.getAttribute("type");
++	SWBuf                     typeAttr        = token.getAttribute("type");
++	SWBuf                     eidAttr         = token.getAttribute("eID");
+ 
+ 	// process start tags
+ 	if (!isEndTag) {
+@@ -688,6 +695,7 @@
+ 				currentVerse.Verse(0);
+ 				strcpy(currentOsisID, currentVerse.getOSISRef());
+ 
++				sidBook         = token.getAttribute("sID");
+ 				inChapter       = false;
+ 				inVerse         = false;
+ 				inPreVerse      = false;
+@@ -733,6 +741,7 @@
+ #endif
+ 				strcpy(currentOsisID, currentVerse.getOSISRef());
+ 
++				sidChapter      = token.getAttribute("sID");
+ 				inChapter       = true;
+ 				inVerse         = false;
+ 				inPreVerse      = false;
+@@ -772,7 +781,7 @@
+ 				// Did we have pre-verse material that needs to be marked?
+ 				if (inPreVerse) {
+ 					char genBuf[200];
+-					sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" eID=\"pv%d\"/>", genID++);
++					sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" eID=\"pv%d\"/>", genID);
+ 					text.append(genBuf);
+ 				}
+ 
+@@ -813,6 +822,7 @@
+ 				}
+ #endif
+ 
++				sidVerse        = token.getAttribute("sID");
+ 				inVerse         = true;
+ 				inPreVerse      = false;
+ 				inBookHeader    = false;
+@@ -966,8 +976,7 @@
+ 		}
+ 
+ 		// VERSE and COMMENTARY END
+-		if (!strcmp(tokenName, "verse") || (inVerse && !strcmp(tokenName, "div"))) {
+-
++		if ((!strcmp(tokenName, "verse")) || ((!strcmp(tokenName, "div")) && (eidAttr == sidVerse))) {
+ 			if (tagDepth != verseDepth) {
+ 				cout << "WARNING(NESTING): verse " << currentOsisID << " is not well formed:(" << verseDepth << "," << tagDepth << ")" << endl;
+ 			}
+@@ -1061,17 +1070,18 @@
+ 		// Also for material that goes with last entry
+ 		if (!inVerse && !inBookHeader && !inChapterHeader) {
+ 			// Is this the end of a chapter.
+-			if (tagDepth == chapterDepth && (!strcmp(tokenName, "div") || !strcmp(tokenName, "chapter"))) {
++			if (((!strcmp(tokenName, "div")) && (eidAttr == sidChapter)) || (!strcmp(tokenName, "chapter"))) {
+ 				text.append(token);
+ 				writeEntry(text);
+ 				inChapter    = false;
++				sidChapter   = "";
+ 				chapterDepth = 0;
+ 				verseDepth   = 0;
+ 				return true;
+ 			}
+ 
+ 			// Is it the end of a book
+-			if (tagDepth == bookDepth && (!strcmp(tokenName, "div"))) {
++			if ((!strcmp(tokenName, "div")) && (eidAttr == sidBook)) {
+ 				text.append(token);
+ 				writeEntry(text);
+ 				bookDepth    = 0;
diff --git a/debian/patches/40_missing_includes.diff b/debian/patches/40_missing_includes.diff
new file mode 100644
index 0000000..92e9b5e
--- /dev/null
+++ b/debian/patches/40_missing_includes.diff
@@ -0,0 +1,61 @@
+Adding missing <stdio.h> includes in the testsuite.
+Index: main/tests/localetest.cpp
+===================================================================
+--- main.orig/tests/localetest.cpp	2009-05-25 10:43:41.000000000 -0700
++++ main/tests/localetest.cpp	2009-05-25 14:51:45.000000000 -0700
+@@ -18,6 +18,7 @@
+ #include <localemgr.h>
+ #include <versekey.h>
+ #include <iostream>
++#include <stdio.h>
+ #ifndef NO_SWORD_NAMESPACE
+ using namespace sword;
+ #endif
+Index: main/tests/parsekey.cpp
+===================================================================
+--- main.orig/tests/parsekey.cpp	2009-05-25 10:43:40.000000000 -0700
++++ main/tests/parsekey.cpp	2009-05-25 14:51:45.000000000 -0700
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <iostream>
++#include <stdio.h>
+ 
+ #include <versekey.h>
+ #include <localemgr.h>
+Index: main/tests/rawldidxtest.cpp
+===================================================================
+--- main.orig/tests/rawldidxtest.cpp	2009-05-25 10:43:40.000000000 -0700
++++ main/tests/rawldidxtest.cpp	2009-05-25 14:51:45.000000000 -0700
+@@ -19,6 +19,7 @@
+ #include <rawstr.h>
+ #include <swmgr.h>
+ #include <filemgr.h>
++#include <stdio.h>
+ 
+ #ifndef __GNUC__
+ #include <io.h>
+Index: main/tests/filtertest.cpp
+===================================================================
+--- main.orig/tests/filtertest.cpp	2009-05-25 10:43:41.000000000 -0700
++++ main/tests/filtertest.cpp	2009-05-25 14:51:45.000000000 -0700
+@@ -20,6 +20,7 @@
+ #include <filemgr.h>
+ #include <papyriplain.h>
+ #include <utf8utf16.h>
++#include <stdio.h>
+ //#include <swmgr.h>
+ #ifndef NO_SWORD_NAMESPACE
+ using namespace sword;
+Index: main/utilities/stepdump.cpp
+===================================================================
+--- main.orig/utilities/stepdump.cpp	2009-05-25 14:52:05.000000000 -0700
++++ main/utilities/stepdump.cpp	2009-05-25 14:52:17.000000000 -0700
+@@ -17,6 +17,7 @@
+ 
+ #include <iostream>
+ #include <string>
++#include <stdio.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4509e64..d4de339 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
 02_libver.diff
-10_diatheke.diff
+11_regex_only_when_needed.diff
+12_fix_compiler_warnings.diff
+13_fix_osis2mod_compression_default.diff
+14_closing_section_not_chapter.diff
+40_missing_includes.diff