diff -urk.orig apr-0.9.5.orig/apr-config.in apr-0.9.5/apr-config.in

--- apr-0.9.5.orig/apr-config.in	2003-08-25 03:10:25 +0400

+++ apr-0.9.5/apr-config.in	2004-08-18 11:29:41 +0400

@@ -72,7 +72,7 @@

 CPPFLAGS="@EXTRA_CPPFLAGS@"

 CFLAGS="@EXTRA_CFLAGS@"

 LDFLAGS="@EXTRA_LDFLAGS@"

-LIBS="@EXTRA_LIBS@"

+LIBS=""

 EXTRA_INCLUDES="@EXTRA_INCLUDES@"

 SHLIBPATH_VAR="@shlibpath_var@"

 APR_SOURCE_DIR="@apr_srcdir@"

diff -urk.orig apr-0.9.5.orig/configure.in apr-0.9.5/configure.in

--- apr-0.9.5.orig/configure.in	2004-05-28 01:12:47 +0400

+++ apr-0.9.5/configure.in	2004-08-19 18:55:20 +0400

@@ -174,7 +174,7 @@

 if test "x$use_libtool" = "xyes"; then

       lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@'

       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"

-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"

+      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) \$(ALL_LIBS) -o \$@"

       so_ext='lo'

       lib_target='-rpath $(libdir) $$objects'

       export_lib_target='-rpath \$(libdir) \$\$objects'

@@ -464,13 +464,9 @@

 dnl without the extra " " in that case, but they didn't do that.  So, we

 dnl end up LIBS="-lm -lcrypt -lnsl  -ldl" which is an annoyance.

 AC_CHECK_LIB(resolv, res_init)

-AC_CHECK_LIB(nsl, gethostbyname)

 AC_SEARCH_LIBS(gethostname, nsl)

 AC_CHECK_LIB(socket, socket)

-AC_SEARCH_LIBS(crypt, crypt ufc)

 AC_CHECK_LIB(truerand, main)

-AC_SEARCH_LIBS(modf, m)

-AC_SEARCH_LIBS(sqrt, m)

 dnl ----------------------------- Checking for Threads

 echo "${nl}Checking for Threads..."

@@ -536,9 +532,7 @@

             AC_TRY_COMPILE([#include <sys/types.h>

 #include <pthread.h>], [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],

               [apr_cv_type_rwlock_t=yes],

-              [AC_TRY_COMPILE([#define _XOPEN_SOURCE 500

-#define _BSD_SOURCE

-#define _SVID_SOURCE

+              [AC_TRY_COMPILE([#define _GNU_SOURCE

 #include <sys/types.h>

 #include <pthread.h>], [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],

               [apr_cv_type_rwlock_t=yes-with-XOPEN_SOURCE], [apr_cv_type_rwlock_t=no])],

@@ -547,7 +541,7 @@

             yes*) AC_DEFINE(HAVE_PTHREAD_RWLOCKS, 1, [Define if pthread rwlocks are available]) ;;

             esac

             if test "$apr_cv_type_rwlock_t" = "yes-with-XOPEN_SOURCE"; then

-               APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE])

+               APR_ADDTO(CPPFLAGS, [-D_GNU_SOURCE])

             fi

         fi

     fi

diff -urk.orig apr-0.9.5.orig/Makefile.in apr-0.9.5/Makefile.in

--- apr-0.9.5.orig/Makefile.in	2003-04-30 21:28:25 +0400

+++ apr-0.9.5/Makefile.in	2004-08-18 11:29:41 +0400

@@ -83,9 +83,11 @@

 	if [ -f shlibtool ]; then \

 		$(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \

 	fi;

-	if [ -f build/apr_rules.mk ]; then \

-		cp build/apr_rules.mk $(DESTDIR)$(installbuilddir); \

-	fi;

+	for i in apr_rules.mk apr_common.m4 find_apr.m4 install.sh config.guess config.sub make_exports.awk make_var_export.awk mkdir.sh; do \

+		if [ -f build/$$i ]; then \

+			cp build/$$i $(DESTDIR)$(installbuilddir); \

+		fi; \

+	done;

 	if [ ! -d $(DESTDIR)$(bindir) ]; then \

 	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \