diff -urp apr-util-1.2.2.orig/apu-config.in apr-util-1.2.2/apu-config.in

--- apr-util-1.2.2.orig/apu-config.in	2005-02-04 22:45:35 +0200

+++ apr-util-1.2.2/apu-config.in	2006-01-08 16:07:47 +0200

@@ -27,7 +27,7 @@ bindir="@bindir@"

 libdir="@libdir@"

 includedir="@includedir@"

-LIBS="@APRUTIL_EXPORT_LIBS@"

+LIBS=""

 INCLUDES="@APRUTIL_INCLUDES@"

 LDFLAGS="@APRUTIL_LDFLAGS@"

diff -urp apr-util-1.2.2.orig/build/apu-conf.m4 apr-util-1.2.2/build/apu-conf.m4

--- apr-util-1.2.2.orig/build/apu-conf.m4	2005-09-20 16:27:50 +0300

+++ apr-util-1.2.2/build/apu-conf.m4	2006-01-08 16:11:03 +0200

@@ -233,8 +245,8 @@ AC_DEFUN([APU_FIND_LDAPLIB], [

     unset ac_cv_lib_${ldaplib}___ldap_init

     AC_CHECK_LIB(${ldaplib}, ldap_init, 

       [

-        APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${ldaplib} ${extralib}])

-        APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])

+        APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${ldaplib}])

+        APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib}])

         AC_CHECK_LIB(${ldaplib}, ldapssl_client_init, apu_has_ldapssl_client_init="1", , ${extralib})

         AC_CHECK_LIB(${ldaplib}, ldapssl_client_deinit, apu_has_ldapssl_client_deinit="1", , ${extralib})

         AC_CHECK_LIB(${ldaplib}, ldapssl_add_trusted_cert, apu_has_ldapssl_add_trusted_cert="1", , ${extralib})

@@ -290,6 +302,7 @@ AC_ARG_WITH(ldap,[  --with-ldap=library 

     LIBLDAP="$withval"

     if test "$LIBLDAP" = "yes"; then

 dnl The iPlanet C SDK 5.0 is as yet untested... 

+      APU_FIND_LDAPLIB("ldap")

       APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")

       APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")

       APU_FIND_LDAPLIB("ldapssl40")

@@ -301,14 +314,14 @@ dnl The iPlanet C SDK 5.0 is as yet unte

       APU_FIND_LDAPLIB("ldap", "-llber -lresolv")

       APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl")

       APU_FIND_LDAPLIB("ldap", "-ldl -lpthread")

-    else

+    elif test "$LIBLDAP" != "no"; then

       APU_FIND_LDAPLIB($LIBLDAP)

       APU_FIND_LDAPLIB($LIBLDAP, "-lresolv")

       APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl")

       APU_FIND_LDAPLIB($LIBLDAP, "-ldl -lpthread")

     fi

-    test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)

+    test "$LIBLDAP" != "no" && test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)

     AC_CHECK_LIB(lber, ber_init)

     AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])

diff -urp apr-util-1.2.2.orig/configure.in apr-util-1.2.2/configure.in

--- apr-util-1.2.2.orig/configure.in	2005-05-05 22:24:29 +0300

+++ apr-util-1.2.2/configure.in	2006-01-08 16:07:47 +0200

@@ -112,6 +112,10 @@ else

 fi

 AC_SUBST(APR_ICONV_DIR)

+AC_SEARCH_LIBS(crypt, crypt ufc)

+APR_ADDTO(APRUTIL_EXPORT_LIBS,[$LIBS])

+APR_ADDTO(APRUTIL_LIBS,[$LIBS])

+

 dnl Find LDAP library

 dnl Determine what DBM backend type to use.

 dnl Find Expat

@@ -125,7 +129,6 @@ APU_CHECK_DBD_SQLITE2

 APU_FIND_EXPAT

 APU_FIND_ICONV

-AC_SEARCH_LIBS(crypt, crypt ufc)

 AC_MSG_CHECKING(if system crypt() function is threadsafe)

 if test "x$apu_crypt_threadsafe" = "x1"; then

   AC_DEFINE(APU_CRYPT_THREADSAFE, 1, [Define if the system crypt() function is threadsafe])

diff -urp apr-util-1.2.2.orig/Makefile.in apr-util-1.2.2/Makefile.in

--- apr-util-1.2.2.orig/Makefile.in	2005-05-24 15:09:35 +0300

+++ apr-util-1.2.2/Makefile.in	2006-01-08 16:07:47 +0200

@@ -27,6 +27,7 @@ TARGETS = $(TARGET_LIB) aprutil.exp

 # bring in rules.mk for standard functionality

 @INCLUDE_RULES@

 @INCLUDE_OUTPUTS@

+EXTRA_LIBS = $(APRUTIL_LIBS)

 CLEAN_SUBDIRS = test @APR_ICONV_DIR@