diff -uprk.orig apr-util-0.9.5.orig/apu-config.in apr-util-0.9.5/apu-config.in

--- apr-util-0.9.5.orig/apu-config.in	2004-02-27 01:03:46 +0300

+++ apr-util-0.9.5/apu-config.in	2004-08-21 18:27:38 +0400

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

 libdir="@libdir@"

 includedir="@includedir@"

-LIBS="@APRUTIL_EXPORT_LIBS@"

+LIBS=""

 INCLUDES="@APRUTIL_INCLUDES@"

 LDFLAGS="@APRUTIL_LDFLAGS@"

diff -uprk.orig apr-util-0.9.5.orig/build/apu-conf.m4 apr-util-0.9.5/build/apu-conf.m4

--- apr-util-0.9.5.orig/build/apu-conf.m4	2003-08-28 21:29:07 +0400

+++ apr-util-0.9.5/build/apu-conf.m4	2004-08-21 18:29:14 +0400

@@ -51,6 +51,12 @@ AC_DEFUN(APU_TEST_EXPAT,[

     expat_libs="-lexpat"

     expat_libtool="$1/lib/libexpat.la"

   elif test -r "$1/include/expat.h" -a \

+    -r "$1/lib/libexpat.so"; then

+    dnl Expat 1.95.* installation (without libtool)

+    expat_include_dir="$1/include"

+    expat_ldflags="-L$1/lib"

+    expat_libs="-lexpat"

+  elif test -r "$1/include/expat.h" -a \

     -r "$1/lib/libexpat.la"; then

     dnl Expat 1.95.* installation (with libtool)

     expat_include_dir="$1/include"

@@ -220,8 +226,6 @@ 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}])

         AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, apu_has_ldap_netscape_ssl="1", , ${extralib})

         AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s, apu_has_ldap_starttls="1", , ${extralib})

         apu_has_ldap="1";

@@ -260,6 +264,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")

@@ -269,14 +274,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(ldap.h, ldap_h=["#include <ldap.h>"])

diff -uprk.orig apr-util-0.9.5.orig/configure.in apr-util-0.9.5/configure.in

--- apr-util-0.9.5.orig/configure.in	2003-12-07 12:59:54 +0300

+++ apr-util-0.9.5/configure.in	2004-08-21 18:27:38 +0400

@@ -89,6 +89,9 @@ APR_SETIFNULL(CPP, `$apr_config --cpp`)

 APR_ADDTO(CFLAGS, `$apr_config --cflags`)

 APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)

+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

@@ -98,7 +101,6 @@ APU_CHECK_DBM

 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 -uprk.orig apr-util-0.9.5.orig/Makefile.in apr-util-0.9.5/Makefile.in

--- apr-util-0.9.5.orig/Makefile.in	2004-03-16 17:23:35 +0300

+++ apr-util-0.9.5/Makefile.in	2004-08-21 18:27:38 +0400

@@ -21,6 +21,7 @@ TARGETS = delete-lib $(TARGET_LIB) delet

 # bring in rules.mk for standard functionality

 @INCLUDE_RULES@

+EXTRA_LIBS = $(APRUTIL_LIBS)

 SUBDIRS = buckets crypto dbm encoding hooks ldap uri xml misc strmatch xlate

 CLEAN_SUBDIRS = test