Makefile.in   |    6 +++++-

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

 configure.in  |    4 ++++

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

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

index afe5af2..bdd89bb 100644

--- a/Makefile.in

+++ b/Makefile.in

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

 bindir=@bindir@

 libdir=@libdir@

 includedir=@includedir@

+installbuilddir=@installbuilddir@

 top_srcdir=@abs_srcdir@

 top_blddir=@abs_builddir@

@@ -75,7 +76,7 @@ apu-config.out: $(APU_CONFIG)

 install: $(TARGETS) install-modules

 	$(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

@@ -85,6 +86,9 @@ install: $(TARGETS) install-modules

 	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) $(EXTRA_OBJECTS)

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

index 0d42371..aa51239 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="@APRUTIL_EXPORT_LIBS@"

@@ -60,6 +61,7 @@ Known values for OPTION are:

   --avoid-dbm       do not include DBM library information with --libs

   --dbm-libs        print additional library information to link with DBM

   --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

@@ -159,6 +161,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 2eb9873..2bd57fd 100644

--- a/configure.in

+++ b/configure.in

@@ -95,6 +95,10 @@ if test -n "$USE_VPATH"; then

     APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES -I$abs_srcdir/include/private -I$abs_srcdir/include"

 fi

+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 includes directory and (possibly) the source (base) dir.

 dnl