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.

PR 56090.

Patch provided by Michael Osipov.

This fixes #11.

Backport of r1839068 from trunk resp. r1839069
from 1.7.x


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1839070 13f79535-47bb-0310-9956-ffa450edef68

Author: rainerjung

Makefile.in

@@ -63,6 +63,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
 includedir=@includedir@
+datadir=@datadir@
 installbuilddir=@installbuilddir@
 
 # Create apr-config script suitable for the install tree

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

configure.in

@@ -272,8 +272,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],