Index: apr-util-1.2.12/apu-config.in
--- apr-util-1.2.12/apu-config.in.orig	2005-02-04 21:45:35 +0100
+++ apr-util-1.2.12/apu-config.in	2007-06-22 21:17:03 +0200
@@ -27,7 +27,7 @@
 libdir="@libdir@"
 includedir="@includedir@"
 
-LIBS="@APRUTIL_EXPORT_LIBS@"
+LIBS="@APRUTIL_EXPORT_LIBS@ @LIBS@"
 INCLUDES="@APRUTIL_INCLUDES@"
 LDFLAGS="@APRUTIL_LDFLAGS@"
 
Index: apr-util-1.2.12/crypto/getuuid.c
--- apr-util-1.2.12/crypto/getuuid.c.orig	2006-04-14 20:01:58 +0200
+++ apr-util-1.2.12/crypto/getuuid.c	2007-06-22 21:17:03 +0200
@@ -131,7 +131,7 @@
 
     /* crap. this isn't crypto quality, but it will be Good Enough */
 
-    get_system_time(&time_now);
+    time_now = apr_time_now();
     srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
 
     return rand() & 0x0FFFF;
Index: apr-util-1.2.12/include/private/apu_select_dbm.h.in
--- apr-util-1.2.12/include/private/apu_select_dbm.h.in.orig	2005-06-14 16:15:16 +0200
+++ apr-util-1.2.12/include/private/apu_select_dbm.h.in	2007-06-22 21:21:19 +0200
@@ -25,4 +25,9 @@
 #define APU_USE_GDBM    @apu_use_gdbm@
 #define APU_USE_DB      @apu_use_db@
 
+#define APU_HAVE_SDBM    @apu_have_sdbm@
+#define APU_HAVE_NDBM    @apu_have_ndbm@
+#define APU_HAVE_GDBM    @apu_have_gdbm@
+#define APU_HAVE_DB      @apu_have_db@
+
 #endif	/* !APU_SELECT_DBM_H */