From 1962afd3992c529b3bf0b4d5c12841cf22ec76b4 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Fri, 17 Aug 2018 15:54:35 +0200
Subject: [PATCH] BZ-56090: installbuilddir as defined with --enable-layout is
 not used

If --with-installbuilddir is not supplied, it unconditially overrides the value
set by APR_SET_LAYOUT. Disable that and stop showing an invalid default value.
---
 Makefile.in   | 1 +
 config.layout | 1 +
 configure.in  | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c3c203bcf42..bf1b55b72d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,6 +70,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 installbuilddir=@installbuilddir@
 
 LDADD_dbd_pgsql = @LDADD_dbd_pgsql@
diff --git a/config.layout b/config.layout
index 0f42e84e273..fb087a855af 100644
--- a/config.layout
+++ b/config.layout
@@ -223,6 +223,7 @@
     libexecdir:    ${exec_prefix}/lib/apr/modules
     mandir:        ${exec_prefix}/share/man
     datadir:       ${exec_prefix}/share/apr
+    installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
     includedir:    ${exec_prefix}/include/apr-${APR_MAJOR_VERSION}
     localstatedir: ${prefix}/var/run
     runtimedir:    ${prefix}/var/run
diff --git a/configure.in b/configure.in
index 6f56b8f9973..58bd7983c31 100644
--- a/configure.in
+++ b/configure.in
@@ -286,8 +286,8 @@ AC_PROG_LIBTOOL
     ;;
 esac
 
-AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
-  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )
+AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files],
+  [ installbuilddir=$withval ] )
 AC_SUBST(installbuilddir)
 
 AC_ARG_WITH(libtool, [  --without-libtool       avoid using libtool to link the library],