diff options
| author | rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68> | 2018-08-25 14:56:57 +0000 |
|---|---|---|
| committer | rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68> | 2018-08-25 14:56:57 +0000 |
| commit | 0f2890b1a3b5c82022204952cd81b71230acccc7 (patch) | |
| tree | 9988f6caa96fdb46b9ef570030d6773612cfd452 | |
| parent | 4955617e7a50b203a5b8f861efddd023456d34c1 (diff) | |
| download | libapr-0f2890b1a3b5c82022204952cd81b71230acccc7.tar.gz | |
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: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1839070 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | config.layout | 1 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5fb760e1c..cc54e9cef 100644 --- a/Makefile.in +++ b/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 diff --git a/config.layout b/config.layout index 0f42e84e2..fb087a855 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 56c016557..be6777f7b 100644 --- a/configure.in +++ b/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], |