Makefile.in   |    6 +++++-

 apu-config.in |   13 +++++++++++++

 configure.in  |    4 ++++

 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/Makefile.in b/Makefile.in

index 68b7c4b..3150e32 100644

--- a/Makefile.in

+++ b/Makefile.in

@@ -47,6 +47,7 @@ exec_prefix=@exec_prefix@

 bindir=@bindir@

 libdir=@libdir@

 includedir=@includedir@

+installbuilddir=@installbuilddir@

 top_srcdir=@abs_srcdir@

 top_blddir=@abs_builddir@

@@ -56,7 +57,7 @@ apu-config.out: $(APU_CONFIG)

 install: $(TARGET_LIB) apu-config.out

 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \

-		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)

+		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir)

 	for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \

 		$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \

 	done

@@ -66,6 +67,9 @@ install: $(TARGET_LIB) apu-config.out

 	done

 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)

 	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)

+	for f in apu-conf.m4 apu-hints.m4 apu-iconv.m4 dbd.m4 dbm.m4 find_apu.m4; do \

+	    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \

+	done

 	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)

 $(TARGET_LIB): $(OBJECTS)

diff --git a/apu-config.in b/apu-config.in

index fadb09e..c1cf1a8 100644

--- a/apu-config.in

+++ b/apu-config.in

@@ -25,6 +25,7 @@ prefix="@prefix@"

 exec_prefix="@exec_prefix@"

 bindir="@bindir@"

 libdir="@libdir@"

+installbuilddir="@installbuilddir@"

 includedir="@includedir@"

 LIBS=""

@@ -54,6 +55,7 @@ Known values for OPTION are:

   --ldflags         print linker flags

   --libs            print library information

   --srcdir          print APR-util source directory

+  --installbuilddir print APR-util build helper directory

   --link-ld         print link switch(es) for linking to APR-util

   --link-libtool    print the libtool inputs for linking to APR-util

   --apu-la-file     print the path to the .la file, if available

@@ -141,6 +143,17 @@ while test $# -gt 0; do

     echo $APU_SOURCE_DIR

     exit 0

     ;;

+    --installbuilddir)

+    if test "$location" = "installed"; then

+        echo "${installbuilddir}"

+    elif test "$location" = "source"; then

+        echo "$APU_SOURCE_DIR/build"

+    else

+        # this is for VPATH builds

+        echo "$APU_BUILD_DIR/build"

+    fi

+    exit 0

+    ;;

     --version)

     echo $APRUTIL_DOTTED_VERSION

     exit 0

diff --git a/configure.in b/configure.in

index f2e0cf4..2f432ca 100644

--- a/configure.in

+++ b/configure.in

@@ -97,6 +97,10 @@ APR_SETIFNULL(CPP, `$apr_config --cpp`)

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

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

+AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR-util build files (defaults to '${datadir}/build-${APRUTIL_MAJOR_VERSION}')],

+  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APRUTIL_MAJOR_VERSION}" ] )

+AC_SUBST(installbuilddir)

+

 dnl

 dnl  Find the APR-ICONV directory.

 dnl