[dev@ fell off the CC list, whoops. forwarding with permission]
On 05/23/2017 10:13 AM, William A Rowe Jr wrote:
On Tue, May 23, 2017 at 11:30 AM, Jacob Champion <champio...@gmail.com> wrote:
Any update on this?
Patches welcome, and appropriate for 1.6.1 GA IMO, since 1.6.0 was withdrawn
(not GA, not beta, not alpha, it simply wasn't a release.)
Attached.
APR-util required APR's installbuilddir machinery, so I copied it over.
The APR patch should apply correctly to both trunk and 1.6.x.
--Jacob
diff --git Makefile.in Makefile.in
index a2a5194..5fb760e 100644
--- Makefile.in
+++ Makefile.in
@@ -91,6 +91,8 @@ install: $(TARGETS)
$(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
done
$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+ $(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir)
+ $(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir)
$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
for i in $(INSTALL_SUBDIRS); do \
diff --git Makefile.in Makefile.in
index 208dd1c..c14989d 100644
--- Makefile.in
+++ Makefile.in
@@ -68,6 +68,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
includedir=@includedir@
+installbuilddir=@installbuilddir@
top_srcdir=@abs_srcdir@
top_blddir=@abs_builddir@
@@ -87,6 +88,7 @@ install: $(TARGETS) install-modules
done
$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) $(top_srcdir)/build/find_apu.m4 $(DESTDIR)$(installbuilddir)
$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
$(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS)
diff --git apu-config.in apu-config.in
index 82109e5..a3a4be2 100644
--- apu-config.in
+++ apu-config.in
@@ -26,6 +26,7 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@"
libdir="@libdir@"
includedir="@includedir@"
+installbuilddir="@installbuilddir@"
LIBS="@APRUTIL_EXPORT_LIBS@"
INCLUDES="@APRUTIL_INCLUDES@"
@@ -148,6 +149,16 @@ while test $# -gt 0; do
flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
fi
;;
+ --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
+ ;;
--ldflags)
flags="$flags $LDFLAGS"
;;
diff --git configure.in configure.in
index 6f9755a..2c3ecdb 100644
--- configure.in
+++ configure.in
@@ -153,6 +153,10 @@ AC_ARG_WITH(apr-iconv,
])
AC_SUBST(APR_ICONV_DIR)
+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 Find LDAP library
dnl Determine what DBM backend type to use.
dnl Find Expat
