--- db4.4-4.4.20.orig/dist/Makefile.in
+++ db4.4-4.4.20/dist/Makefile.in
@@ -707,8 +707,14 @@
 	$(ln) -s $(libdb_version) $(libdb)
 
 # Shared C library.
-$(libso_target): $(C_OBJS)
-	$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
+Versions: $(C_OBJS)
+	rm -f $@
+	printf "DB4_4 {\n  global:\n" > $@
+	nm `sed -n "/^pic_object='\(.*\)'$$/ { s//\1/;p;}" $(C_OBJS)` | grep " [TR] " | cut -d" " -f3 | sed -e 's/$$/;/' >> $@
+	printf "local: *; };\n" >> $@
+
+$(libso_target): $(C_OBJS) Versions
+	$(SOLINK) $(SOFLAGS) -Wl,--version-script=Versions $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
 	$(rm) -f $(libdb)
 	$(ln) -s .libs/$(libdb_version) $(libdb)
 
@@ -1801,7 +1807,7 @@
 # Java API build rules.
 ##################################################
 db_java_wrap@o@: $(srcdir)/libdb_java/db_java_wrap.c
-	$(CC) $(CFLAGS) $?
+	$(CC) $(CFLAGS) -O2 -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include $?
 
 ##################################################
 # Tcl API build rules.
@@ -1811,7 +1817,7 @@
 tcl_db@o@: $(srcdir)/tcl/tcl_db.c
 	$(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $?
 tcl_db_pkg@o@: $(srcdir)/tcl/tcl_db_pkg.c
-	$(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $?
+	$(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) -fno-strict-aliasing $?
 tcl_dbcursor@o@: $(srcdir)/tcl/tcl_dbcursor.c
 	$(CC) $(CFLAGS) $(TCL_INCLUDE_SPEC) $?
 tcl_env@o@: $(srcdir)/tcl/tcl_env.c
--- db4.4-4.4.20.orig/dist/configure
+++ db4.4-4.4.20/dist/configure
@@ -1045,6 +1045,8 @@
   --enable-java           Build Java API.
   --enable-mingw          Build Berkeley DB for MinGW.
   --enable-o_direct       Enable the O_DIRECT flag for direct I/O.
+  --enable-pthreadsmutexes
+                          Use POSIX pthreads mutexes.
   --enable-posixmutexes   Force use of POSIX standard mutexes.
   --enable-pthread_self   Force use of pthread_self to identify threads.
   --enable-rpc            Build RPC client/server.
@@ -1182,7 +1184,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1711,7 +1713,7 @@
 
 DB_VERSION_PATCH="20"
 
-DB_VERSION_STRING='"Sleepycat Software: Berkeley DB 4.4.20: (January 10, 2006)"'
+DB_VERSION_STRING='"Sleepycat Software: Berkeley DB 4.4.20: (February 24, 2006)"'
 
 
 # Process all options before using them.
@@ -1965,6 +1967,23 @@
 echo "$as_me:$LINENO: result: $db_cv_o_direct" >&5
 echo "${ECHO_T}$db_cv_o_direct" >&6
 
+echo "$as_me:$LINENO: checking if --enable-pthreadsmutexes option specified" >&5
+echo $ECHO_N "checking if --enable-pthreadsmutexes option specified... $ECHO_C" >&6
+# Check whether --enable-pthreadsmutexes or --disable-pthreadsmutexes was given.
+if test "${enable_pthreadsmutexes+set}" = set; then
+  enableval="$enable_pthreadsmutexes"
+
+else
+  enableval="no"
+fi;
+db_cv_pthreadsmutexes="$enableval"
+case "$enableval" in
+ no) echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6;;
+yes) echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6;;
+esac
+
 echo "$as_me:$LINENO: checking if --enable-posixmutexes option specified" >&5
 echo $ECHO_N "checking if --enable-posixmutexes option specified... $ECHO_C" >&6
 # Check whether --enable-posixmutexes or --disable-posixmutexes was given.
@@ -3878,8 +3897,7 @@
   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'
+	 { 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=$?
@@ -3937,8 +3955,7 @@
   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'
+	 { 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=$?
@@ -4054,8 +4071,7 @@
   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'
+	 { 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=$?
@@ -4109,8 +4125,7 @@
   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'
+	 { 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=$?
@@ -4155,8 +4170,7 @@
   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'
+	 { 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=$?
@@ -4200,8 +4214,7 @@
   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'
+	 { 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=$?
@@ -4340,8 +4353,7 @@
   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'
+	 { 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=$?
@@ -4939,8 +4951,7 @@
   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'
+	 { 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_status=$?
@@ -4998,8 +5009,7 @@
   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'
+	 { 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_status=$?
@@ -5070,8 +5080,7 @@
   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'
+	 { 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_status=$?
@@ -5115,8 +5124,7 @@
   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'
+	 { 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_status=$?
@@ -5422,8 +5430,7 @@
   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'
+	 { 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_status=$?
@@ -6079,7 +6086,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6082 "configure"' > conftest.$ac_ext
+  echo '#line 6089 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6199,8 +6206,7 @@
   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'
+	 { 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=$?
@@ -6509,8 +6515,7 @@
   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'
+	 { 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=$?
@@ -6680,8 +6685,7 @@
   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'
+	 { 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=$?
@@ -6748,8 +6752,7 @@
   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'
+	 { 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=$?
@@ -7193,7 +7196,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:7196:" \
+echo "$as_me:7199:" \
      "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
@@ -7239,8 +7242,7 @@
   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'
+	 { 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_status=$?
@@ -7289,8 +7291,7 @@
   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'
+	 { 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_status=$?
@@ -8295,11 +8296,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:8298: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8299: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8302: \$? = $ac_status" >&5
+   echo "$as_me:8303: \$? = $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.
@@ -8557,11 +8558,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:8560: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8561: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8564: \$? = $ac_status" >&5
+   echo "$as_me:8565: \$? = $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.
@@ -8619,11 +8620,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:8622: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8623: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8626: \$? = $ac_status" >&5
+   echo "$as_me:8627: \$? = $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
@@ -9047,8 +9048,7 @@
   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'
+	 { 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=$?
@@ -9108,8 +9108,7 @@
   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'
+	 { 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=$?
@@ -10327,8 +10326,7 @@
   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'
+	 { 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=$?
@@ -10431,8 +10429,7 @@
   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'
+	 { 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=$?
@@ -10497,8 +10494,7 @@
   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'
+	 { 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=$?
@@ -10591,8 +10587,7 @@
   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'
+	 { 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=$?
@@ -10657,8 +10652,7 @@
   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'
+	 { 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=$?
@@ -10724,8 +10718,7 @@
   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'
+	 { 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=$?
@@ -10791,8 +10784,7 @@
   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'
+	 { 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=$?
@@ -10867,7 +10859,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10870 "configure"
+#line 10862 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10965,7 +10957,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10968 "configure"
+#line 10960 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12034,8 +12026,7 @@
   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'
+	 { 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_status=$?
@@ -12096,8 +12087,7 @@
   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'
+	 { 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_status=$?
@@ -13224,11 +13214,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:13227: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13217: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13231: \$? = $ac_status" >&5
+   echo "$as_me:13221: \$? = $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.
@@ -13286,11 +13276,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:13289: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13279: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13293: \$? = $ac_status" >&5
+   echo "$as_me:13283: \$? = $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
@@ -14123,8 +14113,7 @@
   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'
+	 { 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_status=$?
@@ -14227,8 +14216,7 @@
   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'
+	 { 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_status=$?
@@ -14293,8 +14281,7 @@
   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'
+	 { 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_status=$?
@@ -14387,8 +14374,7 @@
   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'
+	 { 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_status=$?
@@ -14453,8 +14439,7 @@
   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'
+	 { 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_status=$?
@@ -14520,8 +14505,7 @@
   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'
+	 { 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_status=$?
@@ -14587,8 +14571,7 @@
   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'
+	 { 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_status=$?
@@ -14663,7 +14646,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14666 "configure"
+#line 14649 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14761,7 +14744,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14764 "configure"
+#line 14747 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15646,11 +15629,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:15649: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15632: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15653: \$? = $ac_status" >&5
+   echo "$as_me:15636: \$? = $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.
@@ -15708,11 +15691,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:15711: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15694: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15715: \$? = $ac_status" >&5
+   echo "$as_me:15698: \$? = $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
@@ -16126,8 +16109,7 @@
   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'
+	 { 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_status=$?
@@ -16177,8 +16159,7 @@
   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'
+	 { 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_status=$?
@@ -17842,11 +17823,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:17845: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17826: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17849: \$? = $ac_status" >&5
+   echo "$as_me:17830: \$? = $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.
@@ -18104,11 +18085,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:18107: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18088: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18111: \$? = $ac_status" >&5
+   echo "$as_me:18092: \$? = $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.
@@ -18166,11 +18147,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:18169: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18150: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18173: \$? = $ac_status" >&5
+   echo "$as_me:18154: \$? = $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
@@ -18594,8 +18575,7 @@
   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'
+	 { 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=$?
@@ -18655,8 +18635,7 @@
   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'
+	 { 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=$?
@@ -19874,8 +19853,7 @@
   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'
+	 { 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=$?
@@ -19978,8 +19956,7 @@
   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'
+	 { 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=$?
@@ -20044,8 +20021,7 @@
   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'
+	 { 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=$?
@@ -20138,8 +20114,7 @@
   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'
+	 { 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=$?
@@ -20204,8 +20179,7 @@
   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'
+	 { 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=$?
@@ -20271,8 +20245,7 @@
   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'
+	 { 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=$?
@@ -20338,8 +20311,7 @@
   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'
+	 { 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=$?
@@ -20414,7 +20386,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20417 "configure"
+#line 20389 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20512,7 +20484,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20515 "configure"
+#line 20487 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21846,7 +21818,7 @@
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 21849 "configure" */
+/* #line 21821 "configure" */
 public class Test {
 }
 EOF
@@ -22105,7 +22077,7 @@
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 22108: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 22080: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -22223,7 +22195,7 @@
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 22226 "configure" */
+/* #line 22198 "configure" */
 public class Test {
 }
 EOF
@@ -22260,7 +22232,7 @@
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 22263 "configure" */
+/* [#]line 22235 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
@@ -22570,8 +22542,7 @@
   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'
+	 { 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=$?
@@ -22642,8 +22613,7 @@
   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'
+	 { 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=$?
@@ -22715,8 +22685,7 @@
   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'
+	 { 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=$?
@@ -22770,8 +22739,7 @@
   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'
+	 { 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=$?
@@ -22842,8 +22810,7 @@
   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'
+	 { 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=$?
@@ -22897,8 +22864,7 @@
   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'
+	 { 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=$?
@@ -22968,8 +22934,7 @@
   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'
+	 { 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=$?
@@ -23115,8 +23080,7 @@
   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'
+	 { 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=$?
@@ -23159,8 +23123,7 @@
   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'
+	 { 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=$?
@@ -23238,8 +23201,7 @@
   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'
+	 { 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=$?
@@ -23384,8 +23346,7 @@
   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'
+	 { 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=$?
@@ -23530,8 +23491,7 @@
   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'
+	 { 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=$?
@@ -23676,8 +23636,7 @@
   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'
+	 { 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=$?
@@ -23829,8 +23788,7 @@
   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'
+	 { 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=$?
@@ -23894,8 +23852,7 @@
   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'
+	 { 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=$?
@@ -23961,8 +23918,7 @@
   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'
+	 { 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=$?
@@ -24025,8 +23981,7 @@
   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'
+	 { 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=$?
@@ -24067,8 +24022,7 @@
   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'
+	 { 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=$?
@@ -24125,8 +24079,7 @@
   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'
+	 { 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=$?
@@ -24167,8 +24120,7 @@
   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'
+	 { 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=$?
@@ -24233,8 +24185,7 @@
   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'
+	 { 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=$?
@@ -24265,10 +24216,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24382,8 +24331,7 @@
   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'
+	 { 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=$?
@@ -24446,8 +24394,7 @@
   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'
+	 { 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=$?
@@ -24488,8 +24435,7 @@
   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'
+	 { 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=$?
@@ -24546,8 +24492,7 @@
   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'
+	 { 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=$?
@@ -24588,8 +24533,7 @@
   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'
+	 { 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=$?
@@ -24654,8 +24598,7 @@
   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'
+	 { 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=$?
@@ -24686,10 +24629,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -24803,8 +24744,7 @@
   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'
+	 { 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=$?
@@ -24867,8 +24807,7 @@
   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'
+	 { 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=$?
@@ -24909,8 +24848,7 @@
   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'
+	 { 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=$?
@@ -24967,8 +24905,7 @@
   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'
+	 { 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=$?
@@ -25009,8 +24946,7 @@
   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'
+	 { 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=$?
@@ -25075,8 +25011,7 @@
   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'
+	 { 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=$?
@@ -25107,10 +25042,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -25224,8 +25157,7 @@
   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'
+	 { 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=$?
@@ -25288,8 +25220,7 @@
   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'
+	 { 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=$?
@@ -25330,8 +25261,7 @@
   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'
+	 { 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=$?
@@ -25388,8 +25318,7 @@
   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'
+	 { 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=$?
@@ -25430,8 +25359,7 @@
   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'
+	 { 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=$?
@@ -25496,8 +25424,7 @@
   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'
+	 { 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=$?
@@ -25528,10 +25455,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -25645,8 +25570,7 @@
   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'
+	 { 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=$?
@@ -25709,8 +25633,7 @@
   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'
+	 { 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=$?
@@ -25751,8 +25674,7 @@
   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'
+	 { 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=$?
@@ -25809,8 +25731,7 @@
   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'
+	 { 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=$?
@@ -25851,8 +25772,7 @@
   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'
+	 { 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=$?
@@ -25917,8 +25837,7 @@
   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'
+	 { 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=$?
@@ -25949,10 +25868,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26066,8 +25983,7 @@
   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'
+	 { 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=$?
@@ -26130,8 +26046,7 @@
   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'
+	 { 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=$?
@@ -26172,8 +26087,7 @@
   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'
+	 { 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=$?
@@ -26230,8 +26144,7 @@
   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'
+	 { 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=$?
@@ -26272,8 +26185,7 @@
   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'
+	 { 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=$?
@@ -26338,8 +26250,7 @@
   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'
+	 { 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=$?
@@ -26370,10 +26281,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26487,8 +26396,7 @@
   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'
+	 { 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=$?
@@ -26551,8 +26459,7 @@
   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'
+	 { 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=$?
@@ -26593,8 +26500,7 @@
   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'
+	 { 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=$?
@@ -26651,8 +26557,7 @@
   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'
+	 { 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=$?
@@ -26693,8 +26598,7 @@
   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'
+	 { 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=$?
@@ -26759,8 +26663,7 @@
   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'
+	 { 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=$?
@@ -26791,10 +26694,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26908,8 +26809,7 @@
   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'
+	 { 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=$?
@@ -26972,8 +26872,7 @@
   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'
+	 { 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=$?
@@ -27014,8 +26913,7 @@
   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'
+	 { 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=$?
@@ -27072,8 +26970,7 @@
   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'
+	 { 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=$?
@@ -27114,8 +27011,7 @@
   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'
+	 { 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=$?
@@ -27180,8 +27076,7 @@
   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'
+	 { 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=$?
@@ -27212,10 +27107,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -27329,8 +27222,7 @@
   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'
+	 { 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=$?
@@ -27393,8 +27285,7 @@
   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'
+	 { 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=$?
@@ -27435,8 +27326,7 @@
   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'
+	 { 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=$?
@@ -27493,8 +27383,7 @@
   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'
+	 { 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=$?
@@ -27535,8 +27424,7 @@
   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'
+	 { 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=$?
@@ -27601,8 +27489,7 @@
   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'
+	 { 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=$?
@@ -27633,10 +27520,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -27750,8 +27635,7 @@
   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'
+	 { 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=$?
@@ -27814,8 +27698,7 @@
   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'
+	 { 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=$?
@@ -27856,8 +27739,7 @@
   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'
+	 { 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=$?
@@ -27914,8 +27796,7 @@
   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'
+	 { 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=$?
@@ -27956,8 +27837,7 @@
   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'
+	 { 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=$?
@@ -28022,8 +27902,7 @@
   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'
+	 { 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=$?
@@ -28054,10 +27933,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -28171,8 +28048,7 @@
   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'
+	 { 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=$?
@@ -28235,8 +28111,7 @@
   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'
+	 { 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=$?
@@ -28277,8 +28152,7 @@
   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'
+	 { 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=$?
@@ -28335,8 +28209,7 @@
   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'
+	 { 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=$?
@@ -28377,8 +28250,7 @@
   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'
+	 { 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=$?
@@ -28443,8 +28315,7 @@
   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'
+	 { 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=$?
@@ -28475,10 +28346,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -28592,8 +28461,7 @@
   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'
+	 { 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=$?
@@ -28656,8 +28524,7 @@
   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'
+	 { 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=$?
@@ -28698,8 +28565,7 @@
   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'
+	 { 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=$?
@@ -28756,8 +28622,7 @@
   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'
+	 { 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=$?
@@ -28798,8 +28663,7 @@
   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'
+	 { 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=$?
@@ -28864,8 +28728,7 @@
   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'
+	 { 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=$?
@@ -28896,10 +28759,8 @@
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -29017,8 +28878,7 @@
   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'
+	 { 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=$?
@@ -29082,8 +28942,7 @@
   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'
+	 { 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=$?
@@ -29147,8 +29006,7 @@
   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'
+	 { 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=$?
@@ -29212,8 +29070,7 @@
   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'
+	 { 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=$?
@@ -29278,8 +29135,7 @@
   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'
+	 { 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=$?
@@ -29361,8 +29217,7 @@
   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'
+	 { 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=$?
@@ -29444,8 +29299,7 @@
   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'
+	 { 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=$?
@@ -29527,8 +29381,7 @@
   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'
+	 { 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=$?
@@ -29610,8 +29463,7 @@
   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'
+	 { 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=$?
@@ -29693,8 +29545,7 @@
   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'
+	 { 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=$?
@@ -29776,8 +29627,7 @@
   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'
+	 { 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=$?
@@ -29861,8 +29711,7 @@
   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'
+	 { 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=$?
@@ -29948,8 +29797,7 @@
   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'
+	 { 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=$?
@@ -30008,8 +29856,7 @@
   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'
+	 { 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=$?
@@ -30076,8 +29923,7 @@
   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'
+	 { 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=$?
@@ -30156,8 +30002,7 @@
   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'
+	 { 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=$?
@@ -30233,8 +30078,7 @@
   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'
+	 { 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=$?
@@ -30288,8 +30132,7 @@
   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'
+	 { 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=$?
@@ -30364,8 +30207,7 @@
   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'
+	 { 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=$?
@@ -30419,8 +30261,7 @@
   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'
+	 { 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=$?
@@ -30493,8 +30334,7 @@
   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'
+	 { 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=$?
@@ -30560,8 +30400,7 @@
   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'
+	 { 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=$?
@@ -30623,8 +30462,7 @@
   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'
+	 { 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=$?
@@ -30686,8 +30524,7 @@
   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'
+	 { 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=$?
@@ -30808,8 +30645,7 @@
   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'
+	 { 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=$?
@@ -30835,6 +30671,7 @@
 #
 # If the user specified we use POSIX pthreads mutexes, and we fail to find the
 # full interface, try and configure for just intra-process support.
+if test "$db_cv_pthreadsmutexes" = yes; then
 if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
 	LIBS="$LIBS -lpthread"
 
@@ -30882,8 +30719,7 @@
   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'
+	 { 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=$?
@@ -31000,8 +30836,7 @@
   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'
+	 { 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=$?
@@ -31115,8 +30950,7 @@
   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'
+	 { 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=$?
@@ -31229,8 +31063,7 @@
   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'
+	 { 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=$?
@@ -31304,6 +31137,7 @@
 echo "$as_me: error: unable to find POSIX 1003.1 mutex interfaces" >&2;}
    { (exit 1); exit 1; }; }
 fi
+fi
 
 # UI threads: thr_XXX
 if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then
@@ -31343,8 +31177,7 @@
   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'
+	 { 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=$?
@@ -31402,8 +31235,7 @@
   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'
+	 { 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=$?
@@ -31469,8 +31301,7 @@
   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'
+	 { 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=$?
@@ -31527,8 +31358,7 @@
   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'
+	 { 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=$?
@@ -31584,8 +31414,7 @@
   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'
+	 { 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=$?
@@ -31640,8 +31469,7 @@
   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'
+	 { 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=$?
@@ -31695,8 +31523,7 @@
   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'
+	 { 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=$?
@@ -31754,8 +31581,7 @@
   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'
+	 { 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=$?
@@ -31813,8 +31639,7 @@
   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'
+	 { 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=$?
@@ -31867,8 +31692,7 @@
   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'
+	 { 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=$?
@@ -31920,8 +31744,7 @@
   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'
+	 { 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=$?
@@ -31975,8 +31798,7 @@
   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'
+	 { 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=$?
@@ -32029,8 +31851,7 @@
   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'
+	 { 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=$?
@@ -32083,8 +31904,7 @@
   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'
+	 { 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=$?
@@ -32137,8 +31957,7 @@
   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'
+	 { 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=$?
@@ -32191,8 +32010,7 @@
   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'
+	 { 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=$?
@@ -32245,8 +32063,7 @@
   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'
+	 { 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=$?
@@ -32299,8 +32116,7 @@
   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'
+	 { 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=$?
@@ -32353,8 +32169,7 @@
   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'
+	 { 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=$?
@@ -32407,8 +32222,7 @@
   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'
+	 { 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=$?
@@ -32461,8 +32275,7 @@
   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'
+	 { 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=$?
@@ -32515,8 +32328,7 @@
   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'
+	 { 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=$?
@@ -32569,8 +32381,7 @@
   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'
+	 { 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=$?
@@ -32623,8 +32434,7 @@
   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'
+	 { 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=$?
@@ -32677,8 +32487,7 @@
   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'
+	 { 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=$?
@@ -32731,8 +32540,7 @@
   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'
+	 { 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=$?
@@ -33083,8 +32891,7 @@
   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'
+	 { 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=$?
@@ -33216,8 +33023,7 @@
   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'
+	 { 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=$?
@@ -33332,8 +33138,7 @@
   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'
+	 { 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=$?
@@ -33467,8 +33272,7 @@
   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'
+	 { 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=$?
@@ -33573,8 +33377,7 @@
   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'
+	 { 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=$?
@@ -33686,8 +33489,7 @@
   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'
+	 { 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=$?
@@ -33756,8 +33558,7 @@
   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'
+	 { 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=$?
@@ -33840,8 +33641,7 @@
   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'
+	 { 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=$?
@@ -33927,8 +33727,7 @@
   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'
+	 { 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=$?
@@ -33957,8 +33756,7 @@
   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'
+	 { 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=$?
@@ -34028,8 +33826,7 @@
   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'
+	 { 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=$?
@@ -34081,8 +33878,7 @@
   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'
+	 { 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=$?
@@ -34153,8 +33949,7 @@
   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'
+	 { 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=$?
@@ -34206,8 +34001,7 @@
   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'
+	 { 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=$?
@@ -34329,8 +34123,7 @@
   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'
+	 { 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=$?
@@ -34439,8 +34232,7 @@
   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'
+	 { 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=$?
@@ -34542,8 +34334,7 @@
   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'
+	 { 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=$?
@@ -34659,8 +34450,7 @@
   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'
+	 { 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=$?
@@ -34851,8 +34641,7 @@
   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'
+	 { 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=$?
@@ -34917,8 +34706,7 @@
   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'
+	 { 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=$?
@@ -35016,8 +34804,7 @@
   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'
+	 { 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=$?
@@ -35083,8 +34870,7 @@
   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'
+	 { 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=$?
@@ -35310,8 +35096,7 @@
   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'
+	 { 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=$?
@@ -36504,11 +36289,6 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  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.  */
@@ -36547,6 +36327,12 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  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
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
--- db4.4-4.4.20.orig/dist/aclocal/mutex.ac
+++ db4.4-4.4.20/dist/aclocal/mutex.ac
@@ -147,6 +147,7 @@
 #
 # If the user specified we use POSIX pthreads mutexes, and we fail to find the
 # full interface, try and configure for just intra-process support.
+if test "$db_cv_pthreadsmutexes" = yes; then
 if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
 	LIBS="$LIBS -lpthread"
 	AM_PTHREADS_SHARED("POSIX/pthreads/library")
@@ -166,6 +167,7 @@
 if test "$db_cv_mutex" = "posix_only"; then
 	AC_MSG_ERROR([unable to find POSIX 1003.1 mutex interfaces])
 fi
+fi
 
 # UI threads: thr_XXX
 if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then
--- db4.4-4.4.20.orig/dist/aclocal/options.ac
+++ db4.4-4.4.20/dist/aclocal/options.ac
@@ -154,6 +154,16 @@
 	[db_cv_o_direct="$enable_o_direct"], [db_cv_o_direct="no"])
 AC_MSG_RESULT($db_cv_o_direct)
 
+AC_MSG_CHECKING(if --enable-pthreadsmutexes option specified)
+AC_ARG_ENABLE(pthreadsmutexes,
+	AC_HELP_STRING([--enable-pthreadsmutexes],
+	    [Use POSIX pthreads mutexes.]),, enableval="no")
+db_cv_pthreadsmutexes="$enableval"
+case "$enableval" in
+ no) AC_MSG_RESULT(yes);;
+yes) AC_MSG_RESULT(no);;
+esac
+
 AC_MSG_CHECKING(if --enable-posixmutexes option specified)
 AC_ARG_ENABLE(posixmutexes,
 	[AC_HELP_STRING([--enable-posixmutexes],
--- db4.4-4.4.20.orig/mp/mp_region.c
+++ db4.4-4.4.20/mp/mp_region.c
@@ -247,9 +247,7 @@
 	roff_t reg_size;
 
 	/* Figure out how big each cache region is. */
-	reg_size = (roff_t)(dbenv->mp_gbytes / dbenv->mp_ncache) * GIGABYTE;
-	reg_size += ((roff_t)(dbenv->mp_gbytes %
-	    dbenv->mp_ncache) * GIGABYTE) / dbenv->mp_ncache;
+	reg_size = GIGABYTE / dbenv->mp_ncache * dbenv->mp_gbytes;
 	reg_size += dbenv->mp_bytes / dbenv->mp_ncache;
 	*reg_sizep = reg_size;
 
--- db4.4-4.4.20.orig/qam/qam_files.c
+++ db4.4-4.4.20/qam/qam_files.c
@@ -411,6 +411,12 @@
 	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
 		goto err;
 #endif
+
+	mpf = array->mpfarray[offset].mpf;
+	/* This extent my already be marked for delete and closed. */
+	if (mpf == NULL)
+		goto err;
+
 	/*
 	 * The log must be flushed before the file is deleted.  We depend on
 	 * the log record of the last delete to recreate the file if we crash.
@@ -418,7 +424,6 @@
 	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
 		goto err;
 
-	mpf = array->mpfarray[offset].mpf;
 	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
 	/* Someone could be real slow, let them close it down. */
 	if (array->mpfarray[offset].pinref != 0)
--- db4.4-4.4.20.orig/txn/txn.c
+++ db4.4-4.4.20/txn/txn.c
@@ -1049,12 +1049,14 @@
 		return (ret);
 	memcpy(txn->name, name, len);
 
+	TXN_SYSTEM_LOCK(dbenv);
 	if (td->name != INVALID_ROFF) {
 		__db_shalloc_free(
 		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
 		td->name = INVALID_ROFF;
 	}
 	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
+		TXN_SYSTEM_UNLOCK(dbenv);
 		__db_err(dbenv,
 		    "Unable to allocate memory for transaction name");
 
@@ -1063,6 +1065,7 @@
 
 		return (ret);
 	}
+	TXN_SYSTEM_UNLOCK(dbenv);
 	td->name = R_OFFSET(&mgr->reginfo, p);
 	memcpy(p, name, len);
 
--- db4.4-4.4.20.orig/debian/manpages/db4.4_load.1
+++ db4.4-4.4.20/debian/manpages/db4.4_load.1
@@ -0,0 +1,186 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_LOAD 1 "28 January 2005"
+.SH NAME
+db4.4_load \- Load data from standard in
+.SH SYNOPSIS
+.B db4.4_load
+[-nTV] [-c name=value] [-f file] [-h home] [-P password] [-t btree | hash | queue | recno] file
+
+.B db4.4_load
+[-r lsn | fileid] [-h home] [-P password] file
+.SH DESCRIPTION
+The db4.4_load utility reads from the standard input and loads it into the
+database file. The database file is created if it does not already exist.
+.PP
+The input to db4.4_load must be in the output format specified by the db4.4_dump
+utility, utilities, or as specified for the -T below.
+.SH OPTIONS
+.IP \fB\-c\fR
+Specify configuration options ignoring any value they may have based on
+the input.  The command-line format is \fBname=value\fR.  See the
+Supported Keywords section below for a list of keywords supported by
+the \fB-c\fR option.
+.IP \fB\-f\fR
+Read from the specified \fBinput\fR file instead of from the standard
+input.
+.IP \fB\-h\fR
+Specify a home directory for the database environment.
+.sp
+If a home directory is specified, the database environment is opened
+using the DB_INIT_LOCK, DB_INIT_LOG, DB_INIT_MPOOL, DB_INIT_TXN, and
+DB_USE_ENVIRON flags to DB_ENV->open.  (This means that db4.4_load can be
+used to load data into databases while they are in use by other
+processes.) If the DB_ENV->open call fails, or if no home
+directory is specified, the database is still updated, but the
+environment is ignored; for example, no locking is done.
+.IP \fB\-n\fR
+Do not overwrite existing keys in the database when loading into an
+already existing database.  If a key/data pair cannot be loaded into the
+database for this reason, a warning message is displayed on the standard
+error output, and the key/data pair are skipped.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-r\fR
+Reset the database's file ID or log sequence numbers (LSNs).
+.sp
+All database pages in transactional environments contain references to
+the environment's log records.  In order to copy a database into a
+different database environment, database page references to the old
+environment's log records must be reset, otherwise data corruption can
+occur when the database is modified in the new environment.  The
+\fB-r\fR \fBlsn\fR option resets a database's log sequence
+numbers.
+.sp
+All databases contain an ID string used to identify the database in the
+database environment cache.  If a database is copied, and used in the
+same environment as another file with the same ID string, corruption can
+occur.  The \fB-r\fR \fBfileid\fR  option resets a database's file
+ID to a new value.
+.sp
+\fBIn both cases, the physical file specified by the file argument
+is modified in-place.\fR
+.IP \fB\-T\fR
+The \fB-T\fR option allows non-Berkeley DB applications to easily load text
+files into databases.
+.sp
+If the database to be created is of type Btree or Hash, or the keyword
+\fBkeys\fR is specified as set, the input must be paired lines of text,
+where the first line of the pair is the key item, and the second line of
+the pair is its corresponding data item.  If the database to be created
+is of type Queue or Recno and the keywork \fBkeys\fR is not set, the
+input must be lines of text, where each line is a new data item for the
+database.
+.sp
+A simple escape mechanism, where newline and backslash (\)
+characters are special, is applied to the text input.  Newline characters
+are interpreted as record separators.  Backslash characters in the text
+will be interpreted in one of two ways: If the backslash character
+precedes another backslash character, the pair will be interpreted as a
+literal backslash.  If the backslash character precedes any other
+character, the two characters following the backslash will be interpreted
+as a hexadecimal specification of a single character; for example,
+\0a is a newline character in the ASCII character set.
+.sp
+For this reason, any backslash or newline characters that naturally
+occur in the text input must be escaped to avoid misinterpretation by
+db4.4_load.
+.sp
+If the \fB-T\fR option is specified, the underlying access method type
+must be specified using the \fB-t\fR option.
+.IP \fB\-t\fR
+Specify the underlying access method.  If no \fB-t\fR option is
+specified, the database will be loaded into a database of the same type
+as was dumped; for example, a Hash database will be created if a Hash
+database was dumped.
+.sp
+Btree and Hash databases may be converted from one to the other.  Queue
+and Recno databases may be converted from one to the other.  If the
+\fB-k\fR option was specified on the call to db4.4_dump then Queue
+and Recno databases may be converted to Btree or Hash, with the key being
+the integer record number.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.PP
+The db4.4_load utility may be used with a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_load should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_load
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_load utility exits 0 on success, 1 if one or more key/data
+pairs were not loaded into the database because the key already existed,
+and >1 if an error occurs.
+.SH EXAMPLES
+The db4.4_load utility can be used to load text files into databases.
+For example, the following command loads the standard UNIX
+\fI/etc/passwd\fR file into a database, with the login name as the
+key item and the entire password entry as the data item:
+.PP
+.TR 8
+awk \-F: '{print $1; print $0}' < /etc/passwd |
+sed 's/\\/\\\\/g' | db4.4_load \-T \-t hash passwd.db
+.PP
+Note that backslash characters naturally occurring in the text are escaped
+to avoid interpretation as escape characters by db4.4_load.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH SUPPORTED KEYWORDS
+The following keywords are supported for the \fB-c\fR command-line
+ption to the db4.4_load utility.  See DB->open for further
+discussion of these keywords and what values should be specified.
+.PP
+The parenthetical listing specifies how the value part of the
+\fBname=value\fR pair is interpreted.  Items listed as (boolean)
+expect value to be \fB1\fR (set) or \fB0\fR (unset).  Items listed
+as (number) convert value to a number.  Items listed as (string) use
+the string value without modification.
+.IP bt_minkey (number)
+The minimum number of keys per page.
+.IP chksum (boolean)
+Enable page checksums.
+.IP database (string)
+The database to load.
+.IP db_lorder (number)
+The byte order for integers in the stored database metadata.
+.IP db_pagesize (number)
+The size of database pages, in bytes.
+.IP duplicates (boolean)
+The value of the DB_DUP flag.
+.IP dupsort (boolean)
+The value of the DB_DUPSORT flag.
+.IP extentsize (number)
+The size of database extents, in pages, for Queue databases configured
+to use extents.
+.IP h_ffactor (number)
+The density within the Hash database.
+.IP h_nelem (number)
+The size of the Hash database.
+.IP keys (boolean)
+Specify whether keys are present for Queue or Recno databases.
+.IP re_len (number)
+Specify fixed-length records of the specified length.
+.IP re_pad (string)
+Specify the fixed-length record pad character.
+.IP recnum (boolean)
+The value of the DB_RECNUM flag.
+.IP renumber (boolean)
+The value of the DB_RENUMBER flag.
+.IP subdatabase (string)
+The subdatabase to load.
+
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_load from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_recover.1
+++ db4.4-4.4.20/debian/manpages/db4.4_recover.1
@@ -0,0 +1,95 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_RECOVER 1 "28 January 2005"
+.SH NAME
+db4.4_recover \- Restore the database to a consistent state
+.SH SYNOPSIS
+.B db4.4_recover
+[-ceVv] [-h home] [-P password] [-t [[CC]YY]MMDDhhmm[.SS]]]
+.SH DESCRIPTION
+The db4.4_recover utility must be run after an unexpected application, Berkeley
+DB, or system failure to restore the database to a consistent state. All
+committed transactions are guaranteed to appear after db4.4_recover has run, and
+all uncommitted transactions will be completely undone.
+.SH OPTIONS
+.IP \fB\-c\fR
+Perform catastrophic recovery instead of normal recovery.
+.IP \fB\-e\fR
+Retain the environment after running recovery.  This option
+will rarely be used unless a DB_CONFIG file is present in the home
+directory.  If a DB_CONFIG file is not present, then the regions will be
+created with default parameter values.
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-t\fR
+Recover to the time specified rather than to the most current possible
+date.  The timestamp argument should be in the form
+[[CC]YY]MMDDhhmm[.SS] where each pair of
+letters represents the following:
+.RS
+.IP CC
+The first two digits of the year (the century).
+.IP YY
+The second two digits of the year.  If "YY" is specified, but "CC" is not,
+a value for "YY" between 69 and 99 results in a "CC" value of 19.  Otherwise,
+a "YY" value of 20 is used.
+.IP MM
+The month of the year, from 1 to 12.
+.IP DD
+The day of the month, from 1 to 31.
+.IP hh
+The hour of the day, from 0 to 23.
+.IP mm
+The minute of the hour, from 0 to 59.
+.IP SS
+The second of the minute, from 0 to 61.
+.RE
+.IP
+If the "CC" and "YY" letter pairs are not specified, the values default
+to the current year.  If the "SS" letter pair is not specified, the value
+defaults to 0.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Run in verbose mode.
+.PP
+In the case of catastrophic recovery, an archival copy - or
+\fIsnapshot\fR - of all database files must be restored along with
+all of the log files written since the database file snapshot was made.
+(If disk space is a problem, log files may be referenced by symbolic
+links). 
+.PP
+If the failure was not catastrophic, the files present on the system at the
+time of failure are sufficient to perform recovery.
+.PP
+If log files are missing, db4.4_recover will identify the missing
+log file(s) and fail, in which case the missing log files need to be
+restored and recovery performed again.
+.PP
+The db4.4_recover utility uses a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_recover should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_recover
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_recover utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_recover from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_stat.1
+++ db4.4-4.4.20/debian/manpages/db4.4_stat.1
@@ -0,0 +1,127 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_STAT 1 "28 January 2005"
+.SH NAME
+db4.4_stat \- Display statistics for Berkeley DB environments
+.SH SYNOPSIS
+.B db4.4_stat
+-d file [-fN] [-h home] [-P password] [-s database]
+
+.B db4.4_stat
+[-cEelmNrtVZ] [-C Aclop] [-h home] [-L A] [-M A] [-R A] [-P password]
+.SH DESCRIPTION
+The db4.4_stat utility displays statistics for Berkeley DB environments.
+.SH OPTIONS
+.IP \fB\-C\fR
+Display internal information about the locking subsystem.  (The output
+from this option is often both voluminous and meaningless, and is
+intended only for debugging.)
+.RS
+.IP A
+Display all information.
+.IP c
+Display lock conflict matrix.
+.IP l
+Display lockers within hash chains.
+.IP o
+Display lock objects within hash chains.
+.IP p
+Display locking subsystem parameters.
+.RE
+.IP \fB\-c\fR
+Display locking subsystem statistics, as described in DB_ENV->lock_stat.
+.IP \fB\-d\fR
+Display database statistics for the specified file, as described in
+DB->stat.
+.sp
+If the database contains multiple databases and the \fB-s\fR flag is
+not specified, the statistics are for the internal database that describes
+the other databases the file contains, and not for the file as a whole.
+.IP \fB\-E\fR
+Display internal information about the database environment, including
+all configured subsystems of the database environment.  (The
+output from this option is often both voluminous and meaningless, and
+is intended only for debugging.)
+.IP \fB\-e\fR
+Display information about the database environment, including
+all configured subsystems of the database environment.
+.IP \fB\-f\fR
+Display only those database statistics that can be
+acquired without traversing the database.
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-l\fR
+Display logging subsystem statistics, as described in DB_ENV->log_stat.
+.IP \fB\-M\fR
+Display internal information about the cache.  (The output from this
+option is often both voluminous and meaningless, and is intended only
+for debugging.)
+.RS
+.IP A
+Display all information.
+.IP h
+Display buffers within hash chains.
+.RE
+.IP \fB\-m\fR
+Display cache statistics, as described in DB_ENV->memp_stat.
+.IP \fB\-N\fR
+Do not acquire shared region mutexes while running.  Other problems,
+such as potentially fatal errors in Berkeley DB, will be ignored as well.
+This option is intended only for debugging errors, and should not be
+used under any other circumstances.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-R\fR
+Display internal information about the replication subsystem.  (The
+output from this option is often both voluminous and meaningless, and
+is intended only for debugging.)
+.RS
+.IP A
+Display all information.
+.RE
+.IP \fB\-r\fR
+Display replication statistics, as described in DB_ENV->rep_stat.
+.IP \fB\-s\fR
+Display statistics for the specified database contained in the file
+specified with the \fB-d\fR flag.
+.IP \fB\-t\fR
+Display transaction subsystem statistics, as described in DB_ENV->txn_stat.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-Z\fR
+Reset the statistics after reporting them; valid only with the \fB-C\fR,
+\fB-c\fR, \fB-E\fR, \fB-e\fR, \fB-L\fR, \fB-l\fR,
+\fB-M\fR, \fB-m\fR, \fB-R\fR, \fB-r\fR, and \fB-t\fR
+options.
+.PP
+Values normally displayed in quantities of bytes are displayed as a
+combination of gigabytes (GB), megabytes (MB), kilobytes (KB), and bytes
+(B).  Otherwise, values smaller than 10 million are displayed without
+any special notation, and values larger than 10 million are displayed
+as a number followed by "M".
+.PP
+The db4.4_stat utility may be used with a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_stat should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_stat
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_stat utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_stat from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_upgrade.1
+++ db4.4-4.4.20/debian/manpages/db4.4_upgrade.1
@@ -0,0 +1,81 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_UPGRADE 1 "28 January 2005"
+.SH NAME
+db4.4_upgrade \- Upgrade the Berkeley DB version to the current release version.
+.SH SYNOPSIS
+.B db4.4_upgrade
+[-NsVv] [-h home] [-P password] file ...
+.SH DESCRIPTION
+The db4.4_upgrade utility upgrades the Berkeley DB version of one or more files
+and the databases they contain to the current release version.
+.SH OPTIONS
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-N\fR
+Do not acquire shared region mutexes while running.  Other problems,
+such as potentially fatal errors in Berkeley DB, will be ignored as well.
+This option is intended only for debugging errors, and should not be
+used under any other circumstances.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-s\fR
+This flag is only meaningful when upgrading databases from releases
+before the Berkeley DB 3.1 release.
+.sp
+As part of the upgrade from the Berkeley DB 3.0 release to the 3.1 release,
+the on-disk format of duplicate data items changed. To correctly upgrade
+the format requires that applications specify whether duplicate data
+items in the database are sorted or not. Specifying the \fB-s\fR
+flag means that the duplicates are sorted; otherwise, they are assumed
+to be unsorted.  Incorrectly specifying the value of this flag may lead
+to database corruption.
+.sp
+Because the db4.4_upgrade utility upgrades a physical file
+(including all the databases it contains), it is not possible to use
+db4.4_upgrade to upgrade files where some of the databases it
+includes have sorted duplicate data items, and some of the databases it
+includes have unsorted duplicate data items. If the file does not have
+more than a single database, if the databases do not support duplicate
+data items, or if all the databases that support duplicate data items
+support the same style of duplicates (either sorted or unsorted),
+db4.4_upgrade will work correctly as long as the \fB-s\fR flag
+is correctly specified. Otherwise, the file cannot be upgraded using
+db4.4_upgrade, and must be upgraded manually using the
+db4.4_dump and db4.4_load utilities.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Run in verbose mode, displaying a message for each successful upgrade.
+.PP
+\fBIt is important to realize that Berkeley DB database upgrades are done
+in place, and so are potentially destructive.\fR This means that if the
+system crashes during the upgrade procedure, or if the upgrade procedure
+runs out of disk space, the databases may be left in an inconsistent and
+unrecoverable state.
+.PP
+The db4.4_upgrade utility may be used with a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_upgrade should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_upgrade
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_upgrade utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_upgrade from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_dump.1
+++ db4.4-4.4.20/debian/manpages/db4.4_dump.1
@@ -0,0 +1,120 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_DUMP 1 "28 January 2005"
+.SH NAME
+db4.4_dump \- Write database to flat-text format
+.SH SYNOPSIS
+.B db4.4_dump
+[-klNpRrV] [-d ahr] [-f output] [-h home] [-P password] [-s database] file
+.SH DESCRIPTION
+The db4.4_dump utility reads the database file file and writes it to the standard
+output using a portable flat-text format understood by the db4.4_load utility.
+The file argument must be a file produced using the Berkeley DB library
+functions.
+.SH OPTIONS
+.IP \fB\-d\fR
+Dump the specified database in a format helpful for debugging the Berkeley DB
+library routines.
+.RS
+.IP a
+Display all information.
+.IP h
+Display only page headers.
+.IP r
+Do not display the free-list or pages on the free list.  This
+mode is used by the recovery tests.
+.RE
+.IP
+\fBThe output format of the -d option is not standard and may change,
+without notice, between releases of the Berkeley DB library.\fR
+.IP \fB\-f\fR
+Write to the specified \fBfile\fR instead of to the standard output.
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-k\fR
+Dump record numbers from Queue and Recno databases as keys.
+.IP \fB\-l\fR
+List the databases stored in the file.
+.IP \fB\-N\fR
+Do not acquire shared region mutexes while running.  Other problems,
+such as potentially fatal errors in Berkeley DB, will be ignored as well.
+This option is intended only for debugging errors, and should not be
+used under any other circumstances.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-p\fR
+If characters in either the key or data items are printing characters (as
+defined by \fBisprint\fR(3)), use printing characters in \fBfile\fR
+to represent them.  This option permits users to use standard text editors
+and tools to modify the contents of databases.
+.sp
+Note: different systems may have different notions about what characters
+are considered \fIprinting characters\fR, and databases dumped in
+this manner may be less portable to external systems.
+.IP \fB\-R\fR
+Aggressively salvage data from a possibly corrupt file.  The \fB-R\fR
+flag differs from the \fB-r\fR option in that it will return all
+possible data from the file at the risk of also returning already deleted
+or otherwise nonsensical items.  Data dumped in this fashion will almost
+certainly have to be edited by hand or other means before the data is
+ready for reload into another database
+.IP \fB\-r\fR
+Salvage data from a possibly corrupt file.  When used on a uncorrupted
+database, this option should return equivalent data to a normal dump, but
+most likely in a different order.
+.IP \fB\-s\fR
+Specify a single database to dump.  If no database is specified, all
+databases in the database file are dumped.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.PP
+Dumping and reloading Hash databases that use user-defined hash
+functions will result in new databases that use the default hash
+function.  Although using the default hash function may not be optimal
+for the new database, it will continue to work correctly.
+.PP
+Dumping and reloading Btree databases that use user-defined prefix or
+comparison functions will result in new databases that use the default
+prefix and comparison functions.
+\fBIn this case, it is quite likely that the database will be damaged
+beyond repair permitting neither record storage or retrieval.\fR
+.PP
+The only available workaround for either case is to modify the sources
+for the db4.4_load utility to load the database using the correct
+hash, prefix, and comparison functions.
+.PP
+The db4.4_dump utility output format is documented in the
+Dump Output Formats section of the Berkeley DB Reference Guide.
+.PP
+The db4.4_dump utility may be used with a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_dump should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_dump
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+Even when using a Berkeley DB database environment, the db4.4_dump
+utility does not use any kind of database locking if it is invoked with
+the \fB-d\fR, \fB-R\fR, or \fB-r\fR arguments.   If used with
+one of these arguments, the db4.4_dump utility may only be safely
+run on databases that are not being modified by any other process;
+otherwise, the output may be corrupt.
+.PP
+The db4.4_dump utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_dump from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_deadlock.1
+++ db4.4-4.4.20/debian/manpages/db4.4_deadlock.1
@@ -0,0 +1,97 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_DEADLOCK 1 "28 January 2005"
+.SH NAME
+db4.4_deadlock \- Detect and abort deadlocks
+.SH SYNOPSIS
+.B db4.4_deadlock
+[-Vv] [-a e | m | n | o | W | w | y] [-h home] [-L file] [-t sec.usec]
+.SH DESCRIPTION
+The db4.4_deadlock utility traverses the database environment lock region, and
+aborts a lock request each time it detects a deadlock or a lock request that
+has timed out. By default, in the case of a deadlock, a random lock request is
+chosen to be aborted.
+.PP
+This utility should be run as a background daemon, or the underlying Berkeley
+DB deadlock detection interfaces should be called in some other way, whenever
+there are multiple threads or processes accessing a database and at least one
+of them is modifying it.
+.SH OPTIONS
+.IP \fB\-a\fR
+When a deadlock is detected, abort the locker:
+.RS
+.IP m
+with the most locks
+.IP n
+with the fewest locks
+.IP o
+with the oldest lock
+.IP W
+with the most write locks
+.IP w
+with the fewest write locks
+.IP y
+with the youngest lock
+.RE
+.IP
+When lock or transaction timeouts have been specified:
+.RS
+.IP e
+abort any lock request that has timed out
+.RE
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-L\fR
+Log the execution of the db4.4_deadlock utility to the specified file in the
+following format, where \fI###\fR is the process ID, and the date
+is the time the utility was started.
+.sp
+.TR 8
+db_deadlock: ### Wed Jun 15 01:23:45 EDT 1995
+.sp
+This file will be removed if the db4.4_deadlock utility exits gracefully.
+.IP \fB\-t\fR
+Check the database environment every \fBsec\fR seconds plus
+\fBusec\fR microseconds to see if a process has been forced to wait
+for a lock; if one has, review the database environment lock
+structures.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Run in verbose mode, generating messages each time the detector runs.
+.PP
+If the \fB-t\fR option is not specified, db4.4_deadlock will
+run once and exit.
+.PP
+The db4.4_deadlock utility uses a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_deadlock should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_deadlock
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_deadlock utility does not attempt to create the Berkeley DB
+shared memory regions if they do not already exist.  The application
+which creates the region should be started first, and then, once the
+region is created, the db4.4_deadlock utility should be started.
+.PP
+The DB_ENV->lock_detect method is the underlying method used by the
+db_deadlock utility. See the db_deadlock utility source code for an
+example of using DB_ENV->lock_detect
+in a IEEE/ANSI Std 1003.1 (POSIX) environment.
+.PP
+The db4.4_deadlock utility exits 0 on success, and >0 if an error occurs.
+.PP
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_deadlock from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_archive.1
+++ db4.4-4.4.20/debian/manpages/db4.4_archive.1
@@ -0,0 +1,95 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_ARCHIVE 1 "28 January 2005"
+.SH NAME
+db4.4_archive \- Find unused log files for archiving purposes
+.SH SYNOPSIS
+.B db4.4_archive
+[-adlsVv] [-h home] [-P password]
+.SH DESCRIPTION
+The db4.4_archive utility writes the pathnames of log files that
+are no longer in use (for example, no longer involved in active
+transactions), to the standard output, one pathname per line.  These
+log files should be written to backup media to provide for recovery in
+the case of catastrophic failure (which also requires a snapshot of the
+database files), but they may then be deleted from the system to reclaim
+disk space.
+.SH OPTIONS
+.PP
+.IP \fB\-a\fR
+Write all pathnames as absolute pathnames, instead of relative to the
+database home directories.
+.IP \fB\-d\fR
+Remove log files that are no longer needed; no filenames are written.
+Automatic log file removal is likely to make catastrophic recovery
+impossible.
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-l\fR
+Write out the pathnames of all the database log files, whether or not
+they are involved in active transactions.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-s\fR
+Write the pathnames of all the database files that need to be archived
+in order to recover the database from catastrophic failure.  If any of
+the database files have not been accessed during the lifetime of the
+current log files, db4.4_archive will not include them in this
+output.
+.sp
+It is possible that some of the files to which the log refers have since
+been deleted from the system.  In this case, db4.4_archive will
+ignore them.  When db4.4_recover is run, any files to which the
+log refers that are not present during recovery are assumed to have been
+deleted and will not be recovered.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Run in verbose mode, listing the checkpoints in the log files as they
+are reviewed.
+.PP
+Log cursor handles (returned by the DB_ENV->log_cursor method) may have open
+file descriptors for log files in the database environment.  Also, the
+Berkeley DB interfaces to the database environment logging subsystem (for
+example, DB_ENV->log_put and DB_TXN->abort) may allocate log cursors
+and have open file descriptors for log files as well.  On operating
+systems where filesystem related system calls (for example, rename and
+unlink on Windows/NT) can fail if a process has an open file descriptor
+for the affected file, attempting to move or remove the log files listed
+by db4.4_archive may fail.  All Berkeley DB internal use of log cursors
+operates on active log files only and furthermore, is short-lived in
+nature.  So, an application seeing such a failure should be restructured
+to close any open log cursors it may have, and otherwise to retry the
+operation until it succeeds.  (Although the latter is not likely to be
+necessary; it is hard to imagine a reason to move or rename a log file
+in which transactions are being logged or aborted.)
+.PP
+The db4.4_archive utility uses a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_archive should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_archive
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The DB_ENV->log_archive method is the underlying method used by the db4.4_archive utility.
+See the db4.4_archive utility source code for an example of using
+DB_ENV->log_archive in a IEEE/ANSI Std 1003.1 (POSIX) environment.
+.PP
+The db4.4_archive utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_archive from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_printlog.1
+++ db4.4-4.4.20/debian/manpages/db4.4_printlog.1
@@ -0,0 +1,59 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_PRINTLOG 1 "28 January 2005"
+.SH NAME
+db4.4_printlog \- Dumps Berkeley DB log files in a human-readable format
+.SH SYNOPSIS
+.B db4.4_printlog
+[-NrV] [-b start-LSN] [-e stop-LSN] [-h home] [-P password]
+.SH DESCRIPTION
+The db4.4_printlog utility is a debugging utility that dumps Berkeley DB log files
+in a human-readable format.
+.SH OPTIONS
+.IP \fB\-b\fR
+Display log records starting at log sequence number (LSN) \fBstart-LSN\fR;
+\fBstart-LSN\fR is specified as a file number, followed by a slash (/)
+character, followed by an offset number, with no intervening whitespace.
+.IP \fB\-e\fR
+Stop displaying log records at log sequence number (LSN) \fBstop-LSN\fR;
+\fBstop-LSN\fR is specified as a file number, followed by a slash (/)
+character, followed by an offset number, with no intervening whitespace.
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-N\fR
+Do not acquire shared region mutexes while running.  Other problems,
+such as potentially fatal errors in Berkeley DB, will be ignored as well.
+This option is intended only for debugging errors, and should not be
+used under any other circumstances.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-r\fR
+Read the log files in reverse order.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.PP
+The db4.4_printlog utility uses a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_printlog should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_printlog
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_printlog utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_printlog from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_verify.1
+++ db4.4-4.4.20/debian/manpages/db4.4_verify.1
@@ -0,0 +1,69 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_VERIFY 1 "28 January 2005"
+.SH NAME
+db4.4_verify \-  Verifies the structure databases
+.SH SYNOPSIS
+.B db4.4_verify
+[-NoqV] [-h home] [-P password] file ...
+.SH DESCRIPTION
+The db4.4_verify utility verifies the structure of one or more files and the
+databases they contain.
+.SH OPTIONS
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-o\fR
+Skip the database checks for btree and duplicate sort order and for
+hashing.
+.sp
+If the file being verified contains databases with non-default
+comparison or hashing configurations, calling the db4.4_verify
+utility without the \fB-o\fR flag will usually return failure.  The
+\fB-o\fR flag causes db4.4_verify to ignore database sort or
+hash ordering and allows db4.4_verify to be used on these files.
+To fully verify these files, verify them explicitly using the
+DB->verify method, after configuring the correct comparison or hashing
+functions.
+.IP \fB\-N\fR
+Do not acquire shared region mutexes while running.  Other problems,
+such as potentially fatal errors in Berkeley DB, will be ignored as well.
+This option is intended only for debugging errors, and should not be
+used under any other circumstances.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-q\fR
+Suppress the printing of any error descriptions, simply exit success or
+failure.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.PP
+\fBThe db4.4_verify utility does not perform any locking, even in
+Berkeley DB environments that are configured with a locking subsystem.  As
+such, it should only be used on files that are not being modified by
+another thread of control.\fR
+.PP
+The db4.4_verify utility may be used with a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_verify should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_verify
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_verify utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_verify from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_hotbackup.1
+++ db4.4-4.4.20/debian/manpages/db4.4_hotbackup.1
@@ -0,0 +1,96 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_HOTBACKUP 1 "28 January 2005"
+.SH NAME
+db4.4_hotbackup \- Create "hot backup" or "hot failover" snapshots
+.SH SYNOPSIS
+.B db4.4_hotbackup
+[-cuVv] [-d data_dir ...] [-h home] [-l log_dir] [-P password] -b backup_dir
+.SH DESCRIPTION
+The db4.4_hotbackup utility creates "hot backup" or "hot failover" snapshots of Berkeley DB database environments.
+.PP
+The db4.4_hotbackup utility performs the following steps:
+.RS
+.IP 1.
+If the \-c option is specified, checkpoint the source home database
+environment, and remove any unnecessary log files.
+.IP 2.
+If the target directory for the backup does not exist, it is created with mode
+read-write-execute for the owner.
+.sp
+If the target directory for the backup does exist and the \-u option was
+specified, all log files in the target directory are removed; if the \-u option
+was not specified, all files in the target directory are removed.
+.IP 3.
+If the \-u option was not specified, copy application-specific files found in
+the database environment home directory, or any directory specified using the
+-d option, into the target directory for the backup.
+.IP 4.
+Copy all log files found in the directory specified by the \-l option (or in the
+database environment home directory, if no \-l option was specified), into the
+target directory for the backup.
+.IP 5.
+Perform catastrophic recovery on the hot backup.
+.IP 6.
+Remove any unnecessary log files from the hot backup. 
+.RE
+.PP
+The db4.4_hotbackup utility does not resolve pending transactions that are in the
+prepared state. Applications that use DB_TXN->prepare should specify
+DB_RECOVER_FATAL when opening the environment, and run DB_ENV->txn_recover to
+resolve any pending transactions, when failing over to the hot backup.
+.SH OPTIONS
+.IP \fB\-b\fR
+Specify the target directory for the backup.
+.IP \fB\-c\fR
+Before performing the snapshot, checkpoint the source database environment
+and remove any log files that are no longer required in that environment.
+\fBTo avoid making catastrophic failure impossible, log file removal
+must be integrated with log file archival.\fR
+.IP \fB\-d\fR
+Specify one or more source directories that contain databases; if none
+is specified, the database environment home directory will be searched
+for database files.  As database files are copied into a single backup
+directory, files named the same, stored in different source directories,
+could overwrite each other when copied into the backup directory.
+.IP \fB\-h\fR
+Specify the source directory for the backup, that is, the database
+environment home directory.
+.IP \fB\-l\fR
+Specify a source directory that contains log files; if none is specified,
+the database environment home directory will be searched for log files.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-u\fR
+Update a pre-existing hot backup snapshot by copying in new log files.
+If the \fB\-u\fR option is specified, no databases will be copied
+into the target directory.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Run in verbose mode, listing operations as they are done.
+.PP
+The db4.4_hotbackup utility uses a Berkeley DB environment (as described for the
+\fB\-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_hotbackup should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_hotbackup
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_hotbackup utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_hotbackup from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/berkeley_db4.4_svc.1
+++ db4.4-4.4.20/debian/manpages/berkeley_db4.4_svc.1
@@ -0,0 +1,59 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH BERKELEY_DB4.4_SVC 1 "28 January 2005"
+.SH NAME
+berkeley_db4.4_svc \- Berkeley DB RPC server
+.SH SYNOPSIS
+.B berkeley_db4.4_svc
+[-Vv] [-h home] [-I seconds] [-L file] [-t seconds] [-T seconds]
+.SH DESCRIPTION
+The berkeley_db4.4_svc utility is the Berkeley DB RPC server.
+.SH OPTIONS
+.IP \fB\-h\fR
+Add the specified home directory to the list of allowed home directories
+that can be specified by the client.  The home directory should be an
+absolute pathname.  The last component of each home directory specified
+must be unique because that is how clients specify which database environment
+they want to join.
+.sp
+Recovery will be run on each specified environment before the server
+begins accepting requests from clients.  For this reason, only one copy
+of the server program should ever be run at any time because recovery
+must always be single-threaded.
+.IP \fB\-I\fR
+Set the default idle timeout for client environments to the specified
+number of seconds.  The default timeout is 24 hours.
+.IP \fB\-L\fR
+Log the execution of the berkeley_db4.4_svc utility to the specified file in the
+following format, where \fI###\fR is the process ID, and the date
+is the time the utility was started.
+.sp
+berkeley_db4.4_svc: ### Wed Jun 15 01:23:45 EDT 1995
+.sp
+This file will be removed if the berkeley_db4.4_svc utility exits gracefully.
+.IP \fB\-t\fR
+Set the default timeout for client resources (idle transactions and
+cursors) to the specified number of seconds.  When the timeout expires,
+if the resource is a transaction, it is aborted; if the resource is a
+cursor, it is closed.  The default timeout is 5 minutes.
+.IP \fB\-T\fR
+Set the maximum timeout allowed for client resources.  The default
+timeout is 20 minutes.  If a client application requests a server
+timeout greater than the maximum timeout set for this server, the
+client's timeout will be capped at the maximum timeout value.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Run in verbose mode.
+.PP
+The berkeley_db4.4_svc utility exits 0 on success, and >0 if an error occurs.
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for berkeley_db_svc from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/manpages/db4.4_checkpoint.1
+++ db4.4-4.4.20/debian/manpages/db4.4_checkpoint.1
@@ -0,0 +1,78 @@
+.\" Manual Page for Berkely DB utils, created from upstream
+.\" documentation by Thijs Kinkhorst <thijs@kinkhorst.com>.
+.TH DB4.4_CHECKPOINT 1 "28 January 2005"
+.SH NAME
+db4.4_checkpoint \- Periodically checkpoint transactions
+.SH SYNOPSIS
+.B db4.4_checkpoint
+[-1Vv] [-h home] [-k kbytes] [-L file] [-P password] [-p min]
+.SH DESCRIPTION
+The db4.4_checkpoint utility is a daemon process that monitors the database log,
+and periodically calls DB_ENV->txn_checkpoint to checkpoint it.
+.SH OPTIONS
+.IP \fB\-1\fR
+Checkpoint the log once, regardless of whether or not there has been
+activity since the last checkpoint and then exit.
+.IP \fB\-h\fR
+Specify a home directory for the database environment; by
+default, the current working directory is used.
+.IP \fB\-k\fR
+Checkpoint the database at least as often as every \fBkbytes\fR of log
+file are written.
+.IP \fB\-L\fR
+Log the execution of the db4.4_checkpoint utility to the specified file in the
+following format, where \fI###\fR is the process ID, and the date
+is the time the utility was started.
+.sp
+.TR 8
+db_checkpoint: ### Wed Jun 15 01:23:45 EDT 1995
+.sp
+This file will be removed if the db4.4_checkpoint utility exits gracefully.
+.IP \fB\-P\fR
+Specify an environment password.  Although Berkeley DB utilities overwrite
+password strings as soon as possible, be aware there may be a window of
+vulnerability on systems where unprivileged users can see command-line
+arguments or where utilities are not able to overwrite the memory
+containing the command-line arguments.
+.IP \fB\-p\fR
+Checkpoint the database at least every \fBmin\fR minutes if there has
+been any activity since the last checkpoint.
+.IP \fB\-V\fR
+Write the library version number to the standard output, and exit.
+.IP \fB\-v\fR
+Write the time of each checkpoint attempt to the standard output.
+.PP
+At least one of the \fB-1\fR, \fB-k\fR, and \fB-p\fR options
+must be specified.
+.PP
+The db4.4_checkpoint utility uses a Berkeley DB environment (as described for the
+\fB-h\fR option, the environment variable \fBDB_HOME\fR, or
+because the utility was run in a directory containing a Berkeley DB
+environment).  In order to avoid environment corruption when using a
+Berkeley DB environment, db4.4_checkpoint should always be given the chance to
+detach from the environment and exit gracefully.  To cause db4.4_checkpoint
+to release all environment resources and exit cleanly, send it an
+interrupt signal (SIGINT).
+.PP
+The db4.4_checkpoint utility does not attempt to create the Berkeley DB
+shared memory regions if they do not already exist.  The application
+that creates the region should be started first, and once the region is
+created, the db4.4_checkpoint utility should be started.
+.PP
+The DB_ENV->txn_checkpoint method is the underlying method used by the
+db4.4_checkpoint utility. See the db_checkpoint utility source code for an
+example of using DB_ENV->txn_checkpoint in a IEEE/ANSI Std 1003.1
+(POSIX) environment.
+.PP
+The db4.4_checkpoint utility exits 0 on success, and >0 if an error occurs.
+.PP
+.SH ENVIRONMENT
+.IP \fBDB_HOME\fR
+If the \fB-h\fR option is not specified and the environment variable
+DB_HOME is set, it is used as the path of the database home, as described
+in DB_ENV->open.
+.SH AUTHORS
+Sleepycat Software, Inc. This manual page was created based on
+the HTML documentation for db_checkpoint from Sleepycat,
+by Thijs Kinkhorst <thijs@kinkhorst.com>,
+for the Debian system (but may be used by others).
--- db4.4-4.4.20.orig/debian/changelog.orig
+++ db4.4-4.4.20/debian/changelog.orig
@@ -0,0 +1,120 @@
+db4.4 (4.4.20-8.1ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian; remainging changes:
+    - Build a libdb4.4-java-gcj package.
+    - Don't run the test, when 'nocheck' is passed in DEB_BUILD_OPTIONS.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Aug 2007 08:56:48 +0200
+
+db4.4 (4.4.20-8.1) unstable; urgency=low
+
+  * Non-maintainer upload approved by maintainer.
+  * Disable java support on armel, armeb and m32r. Closes: #426576, #409893
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Thu, 02 Aug 2007 11:58:25 +0300
+
+db4.4 (4.4.20-8ubuntu2) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:14:39 +0000
+
+db4.4 (4.4.20-8ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Build a libdb4.4-java-gcj package.
+    - Don't run the test, when 'nocheck' is passed in DEB_BUILD_OPTIONS.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Nov 2006 16:45:27 +0100
+
+db4.4 (4.4.20-8) unstable; urgency=low
+
+  * Re-enable Java on hppa. 
+
+ -- Clint Adams <schizo@debian.org>  Wed, 16 Aug 2006 12:23:44 -0400
+
+db4.4 (4.4.20-7) unstable; urgency=medium
+
+  * Apply patch to fix region size calculations.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 23 Jul 2006 21:26:18 -0400
+
+db4.4 (4.4.20-6) unstable; urgency=low
+
+  * Re-disable Java packages on arm, mips, mipsel, hppa.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 11 Jun 2006 10:52:38 -0400
+
+db4.4 (4.4.20-5) unstable; urgency=medium
+
+  * Use pthread mutexes on amd64.  closes: #370117.
+  * Re-enable Java packages on arm, mips, mipsel.
+  * Fix db4.4-util man pages not being installed.
+  * Bump to Standards-Version 3.7.2.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  4 Jun 2006 11:48:02 -0400
+
+db4.4 (4.4.20-4) unstable; urgency=low
+
+  * Disable Java packages on kfreebsd-amd64 as well (closes: #357246)
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri, 17 Mar 2006 00:07:28 +1100
+
+db4.4 (4.4.20-3) unstable; urgency=high
+
+  * Disable pthread mutexes so db4.4 will work on ancient kernels.
+    closes: #353812. 
+  * Apply patch from Matthias Klose to compile the java stuff with
+    -fno-strict-aliasing instead of -O0.  closes: #353580.
+  * Use java-gcj-compat stuff instead of gcj-wrapper/gij-wrapper.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 24 Feb 2006 21:21:23 -0500
+
+db4.4 (4.4.20-2) unstable; urgency=medium
+
+  * Fix a bug that could cause a trap during recovery if multiple operations
+    that could remove the same extent were recovered. [#14061]
+  * Fix a bug that could cause traps or hangs if the DB_TXN->set_name
+    function is used in a multithreaded application. [#14033]
+  * Add in man pages for db4.4-util from Thijs Kinkhorst.
+    closes: #350382.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 18 Feb 2006 13:37:35 -0500
+
+db4.4 (4.4.20-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Clint Adams <schizo@debian.org>  Wed, 18 Jan 2006 11:37:32 -0500
+
+db4.4 (4.4.16-4) unstable; urgency=low
+
+  * Apply Sleepycat patch from Florian Weimer to fix DB_REGISTER
+    problem.  closes: #345019.
+  * Compile db_java_wrap.c with -O0 to work around alleged gcj-4.0
+    bug.  closes: #344726.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 28 Dec 2005 10:14:34 -0500
+
+db4.4 (4.4.16-3) unstable; urgency=low
+
+  * Based on evidence from the buildds that Java is still broken on some
+    architectures, disable it AGAIN on mips, mipsel, and now also arm.
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri, 16 Dec 2005 16:15:28 +1100
+
+db4.4 (4.4.16-2) unstable; urgency=medium
+
+  * Use versioned symbols.
+  * Apply Sleepycat patch from Florian Weimer to fix "Cursors and
+    DB_DBT_USERMEM" bug.  closes: #343350.
+  * Temporarily disable java for m68k.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 15 Dec 2005 14:30:55 -0500
+
+db4.4 (4.4.16-1) unstable; urgency=low
+
+  * Initial release, based on db4.3 packaging.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 10 Dec 2005 01:04:01 -0500
--- db4.4-4.4.20.orig/debian/changelog
+++ db4.4-4.4.20/debian/changelog
@@ -0,0 +1,128 @@
+db4.4 (4.4.20-8.1ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian; remainging changes:
+    - Build a libdb4.4-java-gcj package.
+    - Don't run the test, when 'nocheck' is passed in DEB_BUILD_OPTIONS.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Aug 2007 08:56:48 +0200
+
+db4.4 (4.4.20-8.1) unstable; urgency=low
+
+  * Non-maintainer upload approved by maintainer.
+  * Disable java support on armel, armeb and m32r. Closes: #426576, #409893
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Thu, 02 Aug 2007 11:58:25 +0300
+
+db4.4 (4.4.20-8ubuntu2) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:14:39 +0000
+
+db4.4 (4.4.20-8ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Build a libdb4.4-java-gcj package.
+    - Don't run the test, when 'nocheck' is passed in DEB_BUILD_OPTIONS.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Nov 2006 16:45:27 +0100
+
+db4.4 (4.4.20-8) unstable; urgency=low
+
+  * Re-enable Java on hppa. 
+
+ -- Clint Adams <schizo@debian.org>  Wed, 16 Aug 2006 12:23:44 -0400
+
+db4.4 (4.4.20-7) unstable; urgency=medium
+
+  * Apply patch to fix region size calculations.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 23 Jul 2006 21:26:18 -0400
+
+db4.4 (4.4.20-6ubuntu1) edgy; urgency=low
+
+  * Build a libdb4.4-java-gcj package.
+  * Don't run the test, when 'nocheck' is passed in DEB_BUILD_OPTIONS.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue,  3 Oct 2006 12:20:45 +0000
+
+db4.4 (4.4.20-6) unstable; urgency=low
+
+  * Re-disable Java packages on arm, mips, mipsel, hppa.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 11 Jun 2006 10:52:38 -0400
+
+db4.4 (4.4.20-5) unstable; urgency=medium
+
+  * Use pthread mutexes on amd64.  closes: #370117.
+  * Re-enable Java packages on arm, mips, mipsel.
+  * Fix db4.4-util man pages not being installed.
+  * Bump to Standards-Version 3.7.2.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  4 Jun 2006 11:48:02 -0400
+
+db4.4 (4.4.20-4) unstable; urgency=low
+
+  * Disable Java packages on kfreebsd-amd64 as well (closes: #357246)
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri, 17 Mar 2006 00:07:28 +1100
+
+db4.4 (4.4.20-3) unstable; urgency=high
+
+  * Disable pthread mutexes so db4.4 will work on ancient kernels.
+    closes: #353812. 
+  * Apply patch from Matthias Klose to compile the java stuff with
+    -fno-strict-aliasing instead of -O0.  closes: #353580.
+  * Use java-gcj-compat stuff instead of gcj-wrapper/gij-wrapper.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 24 Feb 2006 21:21:23 -0500
+
+db4.4 (4.4.20-2) unstable; urgency=medium
+
+  * Fix a bug that could cause a trap during recovery if multiple operations
+    that could remove the same extent were recovered. [#14061]
+  * Fix a bug that could cause traps or hangs if the DB_TXN->set_name
+    function is used in a multithreaded application. [#14033]
+  * Add in man pages for db4.4-util from Thijs Kinkhorst.
+    closes: #350382.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 18 Feb 2006 13:37:35 -0500
+
+db4.4 (4.4.20-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Clint Adams <schizo@debian.org>  Wed, 18 Jan 2006 11:37:32 -0500
+
+db4.4 (4.4.16-4) unstable; urgency=low
+
+  * Apply Sleepycat patch from Florian Weimer to fix DB_REGISTER
+    problem.  closes: #345019.
+  * Compile db_java_wrap.c with -O0 to work around alleged gcj-4.0
+    bug.  closes: #344726.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 28 Dec 2005 10:14:34 -0500
+
+db4.4 (4.4.16-3) unstable; urgency=low
+
+  * Based on evidence from the buildds that Java is still broken on some
+    architectures, disable it AGAIN on mips, mipsel, and now also arm.
+
+ -- Adam Conrad <adconrad@0c3.net>  Fri, 16 Dec 2005 16:15:28 +1100
+
+db4.4 (4.4.16-2) unstable; urgency=medium
+
+  * Use versioned symbols.
+  * Apply Sleepycat patch from Florian Weimer to fix "Cursors and
+    DB_DBT_USERMEM" bug.  closes: #343350.
+  * Temporarily disable java for m68k.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 15 Dec 2005 14:30:55 -0500
+
+db4.4 (4.4.16-1) unstable; urgency=low
+
+  * Initial release, based on db4.3 packaging.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 10 Dec 2005 01:04:01 -0500
+
--- db4.4-4.4.20.orig/debian/control.orig
+++ db4.4-4.4.20/debian/control.orig
@@ -0,0 +1,113 @@
+Source: db4.4
+Section: libs
+Priority: standard
+Maintainer: Debian Berkeley DB Maintainers <pkg-db-devel@lists.alioth.debian.org>
+Uploaders: Clint Adams <schizo@debian.org>, Matthew Wilcox <willy@debian.org>, Andreas Barth <aba@not.so.argh.org>, Adam Conrad <adconrad@0c3.net>
+Standards-Version: 3.7.2
+Build-Depends: tcl8.4-dev, procps [!hurd-i386], java-gcj-compat-dev [!m32r !m68k !mips !mipsel !arm !armeb !armel !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+
+Package: db4.4-doc
+Architecture: all
+Section: libs
+Priority: optional
+Description: Berkeley v4.4 Database Documentation [html]
+ Complete documentation for all of the API's and utilities provided by
+ version 4.4 of Berkeley DB.
+
+Package: libdb4.4-dev
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: libdb4.4 (= ${Source-Version})
+Suggests: db4.4-doc
+Provides: libdb-dev
+Conflicts: libdb-dev, libdb1-dev, libdb2-dev, libdb3-dev
+Description: Berkeley v4.4 Database Libraries [development]
+ This is the development package which contains headers and static
+ libraries for the Berkeley v4.4 database library.
+
+Package: libdb4.4
+Architecture: any
+Conflicts: libdb2 (<< 2:2.7.7-3)
+Section: libs
+Priority: standard
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries [runtime]
+ This is the runtime package for programs that use the v4.4 Berkeley
+ database library.
+
+Package: db4.4-util
+Architecture: any
+Section: utils
+Priority: optional
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Utilities
+ This package provides different tools for manipulating databases
+ in the Berkeley v4.4 database format, and includes:
+  - db4.4_archive: write the pathnames of the log files no longer in use.
+  - db4.4_checkpoint: daemon process to monitor the database log and
+    checkpoint it periodically.
+  - db4.4_deadlock: traverse the database environment lock region and
+    abort lock requests when a deadlock is detected.
+  - db4.4_load: loads (and creates) a database from standard input.
+  - db4.4_dump: read a database file and write it in a format understood by
+  - db4.4_printlog: dump log files in human readable format.
+  - db4.4_stat: display statistics for Berkeley DB environments.
+  - db4.4_upgrade: upgrades the version of files and the databases they
+    contain.
+  - db4.4_verify: check the structure of files and their databases.
+
+Package: libdb4.4++
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libdb4.4++, libdb2++ (<< 2:2.7.7-3)
+Replaces: libdb4.4++
+Section: libs
+Priority: optional
+Description: Berkeley v4.4 Database Libraries for C++ [runtime]
+ This is the runtime package for programs that use the Berkeley v4.4
+ database library.  This is only for programs which use the C++ interface.
+
+Package: libdb4.4++-dev
+Architecture: any
+Provides: libdb++-dev
+Conflicts: libdb2++-dev, libdb++-dev, libdb3++-dev
+Section: libdevel
+Priority: extra
+Depends: libdb4.4++ (= ${Source-Version}), libdb4.4-dev (= ${Source-Version})
+Description: Berkeley v4.4 Database Libraries for C++ [development]
+ This is the development package which contains headers and static
+ libraries for the Berkeley v4.4 database library.  This is only for
+ programs which will use the C++ interface.
+
+Package: libdb4.4-tcl
+Architecture: any
+Section: interpreters
+Priority: extra
+Conflicts: libdb3-tcl, libdb4.0-tcl, libdb4.1-tcl, libdb4.2-tcl, libdb4.3-tcl
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries for TCL [module]
+ This package provides a TCL module suitable for accessing Berkeley v4.4
+ databases from within TCL programs.
+
+Package: libdb4.4-java
+Architecture: any
+Section: libs
+Priority: optional
+Provides: libdb-java
+Conflicts: libdb-java
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries for Java
+ This package provides the Java interface for the Berkeley v4.4 database
+ library.
+
+Package: libdb4.4-java-dev
+Architecture: any
+Section: libs
+Priority: optional
+Provides: libdb-java-dev
+Conflicts: libdb-java-dev
+Depends: ${shlibs:Depends}, libdb4.4-java
+Description: Berkeley v4.4 Database Libraries for Java [development]
+ This package provides the Java interface for the Berkeley v4.4 database
+  library.
--- db4.4-4.4.20.orig/debian/control
+++ db4.4-4.4.20/debian/control
@@ -0,0 +1,126 @@
+Source: db4.4
+Section: libs
+Priority: standard
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Berkeley DB Maintainers <pkg-db-devel@lists.alioth.debian.org>
+Uploaders: Clint Adams <schizo@debian.org>, Matthew Wilcox <willy@debian.org>, Andreas Barth <aba@not.so.argh.org>, Adam Conrad <adconrad@0c3.net>
+Standards-Version: 3.7.2
+Build-Depends: tcl8.4-dev, procps [!hurd-i386], java-gcj-compat-dev [!m32r !m68k !mips !mipsel !arm !armeb !armel !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+
+Package: db4.4-doc
+Architecture: all
+Section: libs
+Priority: optional
+Description: Berkeley v4.4 Database Documentation [html]
+ Complete documentation for all of the API's and utilities provided by
+ version 4.4 of Berkeley DB.
+
+Package: libdb4.4-dev
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: libdb4.4 (= ${Source-Version})
+Suggests: db4.4-doc
+Provides: libdb-dev
+Conflicts: libdb-dev, libdb1-dev, libdb2-dev, libdb3-dev
+Description: Berkeley v4.4 Database Libraries [development]
+ This is the development package which contains headers and static
+ libraries for the Berkeley v4.4 database library.
+
+Package: libdb4.4
+Architecture: any
+Conflicts: libdb2 (<< 2:2.7.7-3)
+Section: libs
+Priority: standard
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries [runtime]
+ This is the runtime package for programs that use the v4.4 Berkeley
+ database library.
+
+Package: db4.4-util
+Architecture: any
+Section: utils
+Priority: optional
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Utilities
+ This package provides different tools for manipulating databases
+ in the Berkeley v4.4 database format, and includes:
+  - db4.4_archive: write the pathnames of the log files no longer in use.
+  - db4.4_checkpoint: daemon process to monitor the database log and
+    checkpoint it periodically.
+  - db4.4_deadlock: traverse the database environment lock region and
+    abort lock requests when a deadlock is detected.
+  - db4.4_load: loads (and creates) a database from standard input.
+  - db4.4_dump: read a database file and write it in a format understood by
+  - db4.4_printlog: dump log files in human readable format.
+  - db4.4_stat: display statistics for Berkeley DB environments.
+  - db4.4_upgrade: upgrades the version of files and the databases they
+    contain.
+  - db4.4_verify: check the structure of files and their databases.
+
+Package: libdb4.4++
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libdb4.4++, libdb2++ (<< 2:2.7.7-3)
+Replaces: libdb4.4++
+Section: libs
+Priority: optional
+Description: Berkeley v4.4 Database Libraries for C++ [runtime]
+ This is the runtime package for programs that use the Berkeley v4.4
+ database library.  This is only for programs which use the C++ interface.
+
+Package: libdb4.4++-dev
+Architecture: any
+Provides: libdb++-dev
+Conflicts: libdb2++-dev, libdb++-dev, libdb3++-dev
+Section: libdevel
+Priority: extra
+Depends: libdb4.4++ (= ${Source-Version}), libdb4.4-dev (= ${Source-Version})
+Description: Berkeley v4.4 Database Libraries for C++ [development]
+ This is the development package which contains headers and static
+ libraries for the Berkeley v4.4 database library.  This is only for
+ programs which will use the C++ interface.
+
+Package: libdb4.4-tcl
+Architecture: any
+Section: interpreters
+Priority: extra
+Conflicts: libdb3-tcl, libdb4.0-tcl, libdb4.1-tcl, libdb4.2-tcl, libdb4.3-tcl
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries for TCL [module]
+ This package provides a TCL module suitable for accessing Berkeley v4.4
+ databases from within TCL programs.
+
+Package: libdb4.4-java
+Architecture: any
+Section: libs
+Priority: optional
+Provides: libdb-java
+Conflicts: libdb-java
+Suggests: libdb4.4-java-gcj
+Depends: ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries for Java
+ This package provides the Java interface for the Berkeley v4.4 database
+ library.
+
+Package: libdb4.4-java-gcj
+Architecture: any
+Section: libs
+Priority: optional
+Depends: libdb4.4-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries for Java (native code)
+ This package provides the Java interface for the Berkeley v4.4 database
+ library.
+ .
+ This package contains the natively compiled code for use by gij.
+
+Package: libdb4.4-java-dev
+Architecture: any
+Section: libs
+Priority: optional
+Provides: libdb-java-dev
+Conflicts: libdb-java-dev
+Depends: ${shlibs:Depends}, libdb4.4-java
+Description: Berkeley v4.4 Database Libraries for Java [development]
+ This package provides the Java interface for the Berkeley v4.4 database
+  library.
--- db4.4-4.4.20.orig/debian/files
+++ db4.4-4.4.20/debian/files
@@ -0,0 +1,10 @@
+db4.4-doc_4.4.20-6.1_all.deb libs optional
+libdb4.4_4.4.20-6.1_i386.deb libs standard
+libdb4.4-dev_4.4.20-6.1_i386.deb libdevel extra
+libdb4.4++_4.4.20-6.1_i386.deb libs optional
+libdb4.4++-dev_4.4.20-6.1_i386.deb libdevel extra
+libdb4.4-tcl_4.4.20-6.1_i386.deb interpreters extra
+db4.4-util_4.4.20-6.1_i386.deb utils optional
+libdb4.4-java_4.4.20-6.1_i386.deb libs optional
+libdb4.4-java-dev_4.4.20-6.1_i386.deb libs optional
+libdb4.4-java-gcj_4.4.20-6.1_i386.deb libs optional
--- db4.4-4.4.20.orig/debian/rules.orig
+++ db4.4-4.4.20/debian/rules.orig
@@ -0,0 +1,227 @@
+#!/usr/bin/make -f
+
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+JAVA_UNSUPPORTED_CPUS = zm32rz zm68kz zarmz zarmebz zmipsz zmipselz
+JAVA_UNSUPPORTED_SYSTEMS = zgnuz zkfreebsd-gnuz zknetbsd-gnuz
+
+NPTL_SUPPORTED_CPUS = zamd64z
+NPTL_SUPPORTED_SYSTEMS = zlinux-gnuz
+
+CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.4" 
+CONFIGURE_SWITCHES =    --prefix=/usr \
+			--mandir=\$${prefix}/share/man \
+			--localstatedir=/var \
+			--sysconfdir=/etc \
+			--libexecdir=/usr/lib \
+			--enable-cxx \
+			--enable-compat185 \
+			--enable-rpc \
+			--enable-tcl \
+			--with-tcl=/usr/lib/tcl8.4 \
+			--enable-test
+
+DB_BINARY_PKGS = libdb4.4 libdb4.4-dev libdb4.4++ libdb4.4++-dev libdb4.4-tcl db4.4-util
+
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+JAVA_BIN = /usr/lib/jvm/java-gcj/bin
+CONFIGURE_VARS += JAVAC="$(JAVA_BIN)/javac" JAVA="$(JAVA_BIN)/java" JAR="$(JAVA_BIN)/jar"
+CONFIGURE_SWITCHES += --enable-java
+DB_BINARY_PKGS += libdb4.4-java libdb4.4-java-dev
+endif
+endif
+
+ifneq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(NPTL_SUPPORTED_CPUS)))
+ifneq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(NPTL_SUPPORTED_SYSTEMS)))
+CONFIGURE_SWITCHES += --enable-pthreadsmutexes=yes
+endif
+endif
+
+
+#ifneq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,zi386z zia64z zs390z))
+## the LD_ASSUME_KERNEL is to prevent it from building with NPTL.
+#CONFIGURE_VARS += LD_ASSUME_KERNEL=2.4.17
+#endif
+
+package=db4.4
+bdbversion=4.4
+
+version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
+version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
+
+build:
+	$(checkdir)
+	
+	mkdir -p obj
+
+	cd obj && $(CONFIGURE_VARS) \
+		../dist/configure $(CONFIGURE_SWITCHES)
+
+	cd obj && $(MAKE)
+
+#ifneq (,$(findstring $(DEB_BUILD_GNU_CPU),ia64))
+	chmod +x ./debian/runtests.tclsh
+	cd obj && ../debian/runtests.tclsh || true
+
+	grep ^FAIL obj/ALL.OUT || true
+#endif
+
+	touch build
+
+clean:
+	$(checkdir)
+	rm -rf obj
+	rm -f build install-stamp
+	-rm -rf debian/tmp debian/$(package)* debian/lib$(package)* core
+	-rm -f debian/substvars.*
+	rm -rf debian/libdb*
+
+install-stamp: build
+	$(checkdir)
+
+	rm -rf debian/tmp
+	$(INSTALL_DIR) debian/tmp
+
+	cd obj && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+
+	touch install-stamp
+
+binary-indep: checkroot build install-stamp
+	$(checkdir)
+
+	rm -rf debian/$(package)-doc
+	$(INSTALL_DIR) debian/$(package)-doc/usr/share/doc debian/$(package)-doc/DEBIAN
+
+	cd debian/tmp/usr/docs && rm -rf `find . -type d -name ".arch-ids"`
+	cp -a debian/tmp/usr/docs debian/$(package)-doc/usr/share/doc/$(package)-doc
+
+	$(INSTALL_FILE) debian/copyright debian/$(package)-doc/usr/share/doc/$(package)-doc/copyright
+	$(INSTALL_FILE) debian/changelog debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian
+	gzip -9frq debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian
+
+	dpkg-gencontrol -isp -p$(package)-doc -Pdebian/$(package)-doc
+	chown -R root:root debian/$(package)-doc
+	chmod -R ugo=rX,u+w debian/$(package)-doc
+	dpkg --build debian/$(package)-doc ..
+
+binary-arch: checkroot build install-stamp
+	$(checkdir)
+
+	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) \
+		debian/lib$(package)++ debian/lib$(package)++-dev debian/lib$(package)-tcl \
+		debian/lib$(package)-java debian/lib$(package)-java-dev
+	$(INSTALL_DIR) debian/lib$(package)-dev/usr/lib \
+			debian/$(package)-util/usr/share/man/man1 \
+			debian/lib$(package)/usr/lib debian/lib$(package)++/usr/lib \
+			debian/lib$(package)++-dev/usr/include \
+			debian/lib$(package)++-dev/usr/lib \
+			debian/lib$(package)-tcl/usr/lib \
+			debian/lib$(package)-java/usr/lib \
+			debian/lib$(package)-java/usr/share/java \
+			debian/lib$(package)-java-dev/usr/lib
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	strip --remove-section=.note --remove-section=.comment \
+	      debian/tmp/usr/lib/*.so debian/tmp/usr/bin/*
+	strip --strip-debug debian/tmp/usr/lib/*.a
+endif
+
+	chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h
+	chmod 755 debian/tmp/usr/bin/*
+
+	cp -a debian/tmp/usr/include debian/lib$(package)-dev/usr
+	cp -a debian/tmp/usr/bin debian/$(package)-util/usr
+	cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \
+	        debian/tmp/usr/lib/*.la debian/lib$(package)-dev/usr/lib
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+	cp -a debian/tmp/usr/lib/db.jar \
+		debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar
+	ln -s lib$(package)-java-$(version).jar \
+		debian/lib$(package)-java/usr/share/java/lib$(package)-java.jar
+endif
+endif
+	mv debian/lib$(package)-dev/usr/lib/*cxx* debian/lib$(package)++-dev/usr/lib
+	mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include
+	mv debian/lib$(package)-dev/usr/lib/*tcl* debian/lib$(package)-tcl/usr/lib
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+	mv debian/lib$(package)-dev/usr/lib/*java* debian/lib$(package)-java/usr/lib
+
+	mv debian/lib$(package)-java/usr/lib/libdb*.a \
+	   debian/lib$(package)-java/usr/lib/libdb*.la \
+	   debian/lib$(package)-java/usr/lib/libdb_java.so \
+	   debian/lib$(package)-java/usr/lib/libdb_java-4.so \
+	   debian/lib$(package)-java-dev/usr/lib/
+endif
+endif
+	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
+	mv debian/lib$(package)++-dev/usr/lib/libdb_cxx-$(bdbversion).so debian/lib$(package)++/usr/lib
+
+	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
+	ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/libdb.a
+
+	cd debian/$(package)-util/usr/bin && for i in * ; \
+	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \
+	done
+
+	cp debian/manpages/*.1 debian/$(package)-util/usr/share/man/man1
+	gzip -9frq debian/$(package)-util/usr/share/man/man1/*.1
+
+	for i in $(DB_BINARY_PKGS); \
+	do $(INSTALL_DIR) debian/$${i}/DEBIAN debian/$${i}/usr/share/doc/$${i} ; \
+	   $(INSTALL_FILE) debian/copyright debian/$${i}/usr/share/doc/$${i} ; \
+	   $(INSTALL_FILE) debian/changelog debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \
+	   gzip -9fq debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \
+	done
+
+	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
+	echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs
+	echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+	echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs
+endif
+endif
+
+	for i in $(DB_BINARY_PKGS); \
+	do dpkg-shlibdeps -Tdebian/substvars.$${i} -dDepends `find debian/$${i}/usr/lib -name "*.so"` `find debian/$${i}/usr/bin -type f` ; \
+	   dpkg-gencontrol -isp -p$${i} -Pdebian/$${i} -Tdebian/substvars.$${i} ; \
+	   chown -R root:root debian/$${i} ; \
+	   chmod -R ugo=rX,u+w debian/$${i} ; \
+	   dpkg --build debian/$${i} .. ; \
+	done
+
+define checkdir
+	test -f debian/rules
+endef
+
+binary: binary-indep binary-arch
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
--- db4.4-4.4.20.orig/debian/rules
+++ db4.4-4.4.20/debian/rules
@@ -0,0 +1,237 @@
+#!/usr/bin/make -f
+
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+JAVA_UNSUPPORTED_CPUS = zm32rz zm68kz zarmz zarmebz zmipsz zmipselz
+JAVA_UNSUPPORTED_SYSTEMS = zgnuz zkfreebsd-gnuz zknetbsd-gnuz
+-include /usr/share/gcj/debian_defaults
+
+NPTL_SUPPORTED_CPUS = zamd64z
+NPTL_SUPPORTED_SYSTEMS = zlinux-gnuz
+
+CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.4" 
+CONFIGURE_SWITCHES =    --prefix=/usr \
+			--mandir=\$${prefix}/share/man \
+			--localstatedir=/var \
+			--sysconfdir=/etc \
+			--libexecdir=/usr/lib \
+			--enable-cxx \
+			--enable-compat185 \
+			--enable-rpc \
+			--enable-tcl \
+			--with-tcl=/usr/lib/tcl8.4 \
+			--enable-test
+
+DB_BINARY_PKGS = libdb4.4 libdb4.4-dev libdb4.4++ libdb4.4++-dev libdb4.4-tcl db4.4-util
+
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+JAVA_BIN = /usr/lib/jvm/java-gcj/bin
+CONFIGURE_VARS += JAVAC="$(JAVA_BIN)/javac" JAVA="$(JAVA_BIN)/java" JAR="$(JAVA_BIN)/jar"
+CONFIGURE_SWITCHES += --enable-java
+DB_BINARY_PKGS += libdb4.4-java libdb4.4-java-dev
+ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+DB_BINARY_PKGS += libdb4.4-java-gcj
+endif
+endif
+endif
+
+ifneq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(NPTL_SUPPORTED_CPUS)))
+ifneq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(NPTL_SUPPORTED_SYSTEMS)))
+CONFIGURE_SWITCHES += --enable-pthreadsmutexes=yes
+endif
+endif
+
+
+#ifneq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,zi386z zia64z zs390z))
+## the LD_ASSUME_KERNEL is to prevent it from building with NPTL.
+#CONFIGURE_VARS += LD_ASSUME_KERNEL=2.4.17
+#endif
+
+package=db4.4
+bdbversion=4.4
+
+version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
+version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
+
+build:
+	$(checkdir)
+	
+	mkdir -p obj
+
+	cd obj && $(CONFIGURE_VARS) \
+		../dist/configure $(CONFIGURE_SWITCHES)
+
+	cd obj && $(MAKE)
+
+#ifneq (,$(findstring $(DEB_BUILD_GNU_CPU),ia64))
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	chmod +x ./debian/runtests.tclsh
+	cd obj && ../debian/runtests.tclsh || true
+
+	grep ^FAIL obj/ALL.OUT || true
+endif
+#endif
+
+	touch build
+
+clean:
+	$(checkdir)
+	rm -rf obj
+	rm -f build install-stamp
+	-rm -rf debian/tmp debian/$(package)* debian/lib$(package)* core
+	-rm -f debian/substvars.*
+	rm -rf debian/libdb*
+
+install-stamp: build
+	$(checkdir)
+
+	rm -rf debian/tmp
+	$(INSTALL_DIR) debian/tmp
+
+	cd obj && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+
+	touch install-stamp
+
+binary-indep: checkroot build install-stamp
+	$(checkdir)
+
+	rm -rf debian/$(package)-doc
+	$(INSTALL_DIR) debian/$(package)-doc/usr/share/doc debian/$(package)-doc/DEBIAN
+
+	cd debian/tmp/usr/docs && rm -rf `find . -type d -name ".arch-ids"`
+	cp -a debian/tmp/usr/docs debian/$(package)-doc/usr/share/doc/$(package)-doc
+
+	$(INSTALL_FILE) debian/copyright debian/$(package)-doc/usr/share/doc/$(package)-doc/copyright
+	$(INSTALL_FILE) debian/changelog debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian
+	gzip -9frq debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian
+
+	dpkg-gencontrol -isp -p$(package)-doc -Pdebian/$(package)-doc
+	chown -R root:root debian/$(package)-doc
+	chmod -R ugo=rX,u+w debian/$(package)-doc
+	dpkg --build debian/$(package)-doc ..
+
+binary-arch: checkroot build install-stamp
+	$(checkdir)
+
+	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) \
+		debian/lib$(package)++ debian/lib$(package)++-dev debian/lib$(package)-tcl \
+		debian/lib$(package)-java debian/lib$(package)-java-dev
+	$(INSTALL_DIR) debian/lib$(package)-dev/usr/lib \
+			debian/$(package)-util/usr/share/man/man1 \
+			debian/lib$(package)/usr/lib debian/lib$(package)++/usr/lib \
+			debian/lib$(package)++-dev/usr/include \
+			debian/lib$(package)++-dev/usr/lib \
+			debian/lib$(package)-tcl/usr/lib \
+			debian/lib$(package)-java/usr/lib \
+			debian/lib$(package)-java/usr/share/java \
+			debian/lib$(package)-java-dev/usr/lib
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	strip --remove-section=.note --remove-section=.comment \
+	      debian/tmp/usr/lib/*.so debian/tmp/usr/bin/*
+	strip --strip-debug debian/tmp/usr/lib/*.a
+endif
+
+	chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h
+	chmod 755 debian/tmp/usr/bin/*
+
+	cp -a debian/tmp/usr/include debian/lib$(package)-dev/usr
+	cp -a debian/tmp/usr/bin debian/$(package)-util/usr
+	cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \
+	        debian/tmp/usr/lib/*.la debian/lib$(package)-dev/usr/lib
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+	cp -a debian/tmp/usr/lib/db.jar \
+		debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar
+	ln -s lib$(package)-java-$(version).jar \
+		debian/lib$(package)-java/usr/share/java/lib$(package)-java.jar
+ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+	dh_nativejava -plib$(package)-java-gcj
+endif
+endif
+endif
+	mv debian/lib$(package)-dev/usr/lib/*cxx* debian/lib$(package)++-dev/usr/lib
+	mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include
+	mv debian/lib$(package)-dev/usr/lib/*tcl* debian/lib$(package)-tcl/usr/lib
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+	mv debian/lib$(package)-dev/usr/lib/*java* debian/lib$(package)-java/usr/lib
+
+	mv debian/lib$(package)-java/usr/lib/libdb*.a \
+	   debian/lib$(package)-java/usr/lib/libdb*.la \
+	   debian/lib$(package)-java/usr/lib/libdb_java.so \
+	   debian/lib$(package)-java/usr/lib/libdb_java-4.so \
+	   debian/lib$(package)-java-dev/usr/lib/
+endif
+endif
+	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
+	mv debian/lib$(package)++-dev/usr/lib/libdb_cxx-$(bdbversion).so debian/lib$(package)++/usr/lib
+
+	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
+	ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/libdb.a
+
+	cd debian/$(package)-util/usr/bin && for i in * ; \
+	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \
+	done
+
+	cp debian/manpages/*.1 debian/$(package)-util/usr/share/man/man1
+	gzip -9frq debian/$(package)-util/usr/share/man/man1/*.1
+
+	for i in $(DB_BINARY_PKGS); \
+	do $(INSTALL_DIR) debian/$${i}/DEBIAN debian/$${i}/usr/share/doc/$${i} ; \
+	   $(INSTALL_FILE) debian/copyright debian/$${i}/usr/share/doc/$${i} ; \
+	   $(INSTALL_FILE) debian/changelog debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \
+	   gzip -9fq debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \
+	done
+
+	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
+	echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs
+	echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs
+ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+	echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs
+endif
+endif
+
+	for i in $(DB_BINARY_PKGS); \
+	do dpkg-shlibdeps -Tdebian/substvars.$${i} -dDepends `find debian/$${i}/usr/lib -name "*.so"` `find debian/$${i}/usr/bin -type f` ; \
+	   dpkg-gencontrol -isp -p$${i} -Pdebian/$${i} -Tdebian/substvars.$${i} ; \
+	   chown -R root:root debian/$${i} ; \
+	   chmod -R ugo=rX,u+w debian/$${i} ; \
+	   dpkg --build debian/$${i} .. ; \
+	done
+
+define checkdir
+	test -f debian/rules
+endef
+
+binary: binary-indep binary-arch
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
--- db4.4-4.4.20.orig/debian/copyright
+++ db4.4-4.4.20/debian/copyright
@@ -0,0 +1,109 @@
+This package was debianized by Clint Adams <schizo@debian.org> on
+Thu, 12 Dec 2002 10:50:20 -0500.
+
+It was downloaded from http://www.sleepycat.com/download.html
+
+Copyright:
+
+/*-
+ * $Id: LICENSE,v 12.1 2005/06/16 20:20:10 bostic Exp $
+ */
+
+The following is the license that applies to this copy of the Berkeley DB
+software.  For a license to use the Berkeley DB software under conditions
+other than those described here, or to purchase support for this software,
+please contact Sleepycat Software by email at info@sleepycat.com, or on
+the Web at http://www.sleepycat.com.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+/*
+ * Copyright (c) 1990-2005
+ *	Sleepycat Software.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Redistributions in any form must be accompanied by information on
+ *    how to obtain complete source code for the DB software and any
+ *    accompanying software that uses the DB software.  The source code
+ *    must either be included in the distribution or be available for no
+ *    more than the cost of distribution plus a nominal fee, and must be
+ *    freely redistributable under reasonable conditions.  For an
+ *    executable file, complete source code means the source code for all
+ *    modules it contains.  It does not include source code for modules or
+ *    files that typically accompany the major components of the operating
+ *    system on which the executable file runs.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO EVENT SHALL SLEEPYCAT SOFTWARE
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1990, 1993, 1994, 1995
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1995, 1996
+ *	The President and Fellows of Harvard University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
--- db4.4-4.4.20.orig/debian/runtests.tclsh
+++ db4.4-4.4.20/debian/runtests.tclsh
@@ -0,0 +1,56 @@
+#!/usr/bin/tclsh
+
+source ../test/test.tcl
+#run_std
+
+global one_test
+source ../test/include.tcl
+
+set one_test "ALL"
+set display 1
+set run 1
+
+fileremove -f ALL.OUT
+
+set o [open ALL.OUT a]
+puts -nonewline "Modified test suite run started at: "
+puts [clock format [clock seconds] -format "%H:%M %D"]
+puts [berkdb version -string]
+
+puts -nonewline $o "Modified test suite run started at: "
+puts $o [clock format [clock seconds] -format "%H:%M %D"]
+puts $o [berkdb version -string]
+
+close $o
+
+set test_list {
+{"environment"		"env"}
+{"archive"		"archive"}
+{"locking"		"lock"}
+{"logging"		"log"}
+{"memory pool"		"memp"}
+{"mutex"		"mutex"}
+{"transaction"		"txn"}
+{"byte-order"		"byte"}
+{"recno backing file"	"rsrc"}
+{"DBM interface"	"dbm"}
+{"NDBM interface"	"ndbm"}
+{"Hsearch interface"	"hsearch"}
+}
+#{"file operations"	"fop"}
+#{"deadlock detection"	"dead"}
+#{"subdatabase"		"sdb"}
+#{"secondary index"	"sindex"}
+
+foreach pair $test_list {
+	set msg [lindex $pair 0]
+set cmd [lindex $pair 1]
+puts "Running $msg tests ([clock format [clock seconds] -format "%H:%M:%S"])"
+if [catch {exec /usr/bin/tclsh << \
+			"source ../test/test.tcl; r $cmd" \
+		>>& ALL.OUT } res] {
+		set o [open ALL.OUT a]
+	puts $o "FAIL: $cmd test: $res"
+	close $o
+}
+}