# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# 
# T2 SDE: package/.../apr-util/libsuff.patch
# Copyright (C) 2006 The T2 SDE Project
# 
# More information can be found in the files COPYING and README.
# 
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---

--- apr-util-1.2.7/configure.orig	2006-09-05 06:04:34.000000000 +0200
+++ apr-util-1.2.7/configure	2006-09-05 06:17:27.000000000 +0200
@@ -13816,7 +13816,7 @@
       apu_have_gdbm=0
     else
       CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      LIBS="-L$withval/lib${libsuff} "
 
       echo "$as_me:$LINENO: checking checking for gdbm in $withval" >&5
 echo $ECHO_N "checking checking for gdbm in $withval... $ECHO_C" >&6
@@ -14032,10 +14032,10 @@
       if test "$apu_have_gdbm" != "0"; then
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -14102,7 +14102,7 @@
         ;;
         *)
           NDBM_INC="-I$withval/include"
-          NDBM_LDFLAGS="-L$withval/lib"
+          NDBM_LDFLAGS="-L$withval/lib${libsuff}"
           echo "$as_me:$LINENO: checking checking for ndbm includes in $withval" >&5
 echo $ECHO_N "checking checking for ndbm includes in $withval... $ECHO_C" >&6
         ;;
@@ -14670,7 +14670,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -15198,10 +15198,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -15273,7 +15273,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -15801,10 +15801,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -15876,7 +15876,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -16404,10 +16404,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -16479,7 +16479,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -17007,10 +17007,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -17082,7 +17082,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -17610,10 +17610,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -17685,7 +17685,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -18213,10 +18213,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -18288,7 +18288,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -18816,10 +18816,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -18891,7 +18891,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -19419,10 +19419,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -19494,7 +19494,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -20022,10 +20022,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -20121,7 +20121,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -20649,10 +20649,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -20730,7 +20730,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -21258,10 +21258,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -21339,7 +21339,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -21867,10 +21867,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -21948,7 +21948,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -22476,10 +22476,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -22557,7 +22557,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -23085,10 +23085,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -23166,7 +23166,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -23694,10 +23694,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -23775,7 +23775,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -24303,10 +24303,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -24384,7 +24384,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -24912,10 +24912,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -24993,7 +24993,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -25521,10 +25521,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -25605,7 +25605,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -26133,10 +26133,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -26208,7 +26208,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -26736,10 +26736,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -26811,7 +26811,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -27339,10 +27339,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -27414,7 +27414,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -27942,10 +27942,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -28017,7 +28017,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -28545,10 +28545,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -28620,7 +28620,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -29148,10 +29148,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -29223,7 +29223,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -29751,10 +29751,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -29826,7 +29826,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -30354,10 +30354,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -30429,7 +30429,7 @@
       ;;
       * )
         if test -d $bdb_place; then
-          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+          LDFLAGS="$LDFLAGS -L$bdb_place/lib${libsuff}"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
           echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
@@ -30957,10 +30957,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib\""
-    APRUTIL_LDFLAGS="-L$found/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$found/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$found/lib${libsuff}"
   else
-    apr_addto_bugger="-L$found/lib"
+    apr_addto_bugger="-L$found/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -31739,7 +31739,7 @@
       apu_have_pgsql=0
     else
       CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      LIBS="-L$withval/lib${libsuff} "
 
       { echo "$as_me:$LINENO: checking for pgsql in $withval" >&5
 echo "$as_me: checking for pgsql in $withval" >&6;}
@@ -31955,10 +31955,10 @@
       if test "$apu_have_pgsql" != "0"; then
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -32230,10 +32230,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -32970,7 +32970,7 @@
       apu_have_mysql=0
     else
       CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      LIBS="-L$withval/lib${libsuff} "
 
       { echo "$as_me:$LINENO: checking for mysql in $withval" >&5
 echo "$as_me: checking for mysql in $withval" >&6;}
@@ -33186,10 +33186,10 @@
       if test "$apu_have_mysql" != "0"; then
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -33462,10 +33462,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -33970,7 +33970,7 @@
       apu_have_sqlite3=0
     else
       CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      LIBS="-L$withval/lib${libsuff} "
 
       { echo "$as_me:$LINENO: checking for sqlite3 in $withval" >&5
 echo "$as_me: checking for sqlite3 in $withval" >&6;}
@@ -34186,10 +34186,10 @@
       if test "$apu_have_sqlite3" != "0"; then
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -34714,7 +34714,7 @@
       apu_have_sqlite2=0
     else
       CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      LIBS="-L$withval/lib${libsuff} "
 
       { echo "$as_me:$LINENO: checking for sqlite2 in $withval" >&5
 echo "$as_me: checking for sqlite2 in $withval" >&6;}
@@ -34930,10 +34930,10 @@
       if test "$apu_have_sqlite2" != "0"; then
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$withval/lib${libsuff}"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-L$withval/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do
@@ -35918,10 +35918,10 @@
 
 
   if test "x$LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-L$apu_iconv_dir/lib\""
-    LDFLAGS="-L$apu_iconv_dir/lib"
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-L$apu_iconv_dir/lib${libsuff}\""
+    LDFLAGS="-L$apu_iconv_dir/lib${libsuff}"
   else
-    apr_addto_bugger="-L$apu_iconv_dir/lib"
+    apr_addto_bugger="-L$apu_iconv_dir/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $LDFLAGS; do
@@ -36341,21 +36341,21 @@
   fi
 
 
-  if test "x$LDFLAGS" = "x-L$apu_iconv_dir/lib"; then
+  if test "x$LDFLAGS" = "x-L$apu_iconv_dir/lib${libsuff}"; then
     test "x$silent" != "xyes" && echo "  nulling LDFLAGS"
     LDFLAGS=""
   else
     apr_new_bugger=""
     apr_removed=0
     for i in $LDFLAGS; do
-      if test "x$i" != "x-L$apu_iconv_dir/lib"; then
+      if test "x$i" != "x-L$apu_iconv_dir/lib${libsuff}"; then
         apr_new_bugger="$apr_new_bugger $i"
       else
         apr_removed=1
       fi
     done
     if test $apr_removed = "1"; then
-      test "x$silent" != "xyes" && echo "  removed \"-L$apu_iconv_dir/lib\" from LDFLAGS"
+      test "x$silent" != "xyes" && echo "  removed \"-L$apu_iconv_dir/lib${libsuff}\" from LDFLAGS"
       LDFLAGS=$apr_new_bugger
     fi
   fi
@@ -36383,10 +36383,10 @@
 
 
   if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$apu_iconv_dir/lib\""
-    APRUTIL_LDFLAGS="-L$apu_iconv_dir/lib"
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$apu_iconv_dir/lib${libsuff}\""
+    APRUTIL_LDFLAGS="-L$apu_iconv_dir/lib${libsuff}"
   else
-    apr_addto_bugger="-L$apu_iconv_dir/lib"
+    apr_addto_bugger="-L$apu_iconv_dir/lib${libsuff}"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $APRUTIL_LDFLAGS; do