From: Graham Leggett Date: Mon, 30 Dec 2019 10:29:24 +0000 (+0000) Subject: configure: Add manualdir and proxycachedir to the APR_ENABLE_LAYOUT macro call X-Git-Tag: 2.5.0-alpha2-ci-test-only~1735 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe1476440de510fd922b59dcdf9eebcd31b1633d;p=thirdparty%2Fapache%2Fhttpd.git configure: Add manualdir and proxycachedir to the APR_ENABLE_LAYOUT macro call git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872103 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 292f93e0458..bcae9fbc498 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.1 + *) configure: Add manualdir and proxycachedir to the APR_ENABLE_LAYOUT macro call. + [Graham Leggett] + *) Add support for cross compiling to apxs. If apxs is being executed from somewhere other than its target location, add that prefix to includes and library directories. Without this, apxs would fail to find config_vars.mk and exit. [Graham Leggett] diff --git a/configure.in b/configure.in index 3974f3327ec..423d58d4b9a 100644 --- a/configure.in +++ b/configure.in @@ -41,7 +41,7 @@ dnl Something seems broken here. AC_PREFIX_DEFAULT(/usr/local/apache2) dnl Get the layout here, so we can pass the required variables to apr -APR_ENABLE_LAYOUT(Apache, [errordir iconsdir htdocsdir cgidir statedir]) +APR_ENABLE_LAYOUT(Apache, [errordir iconsdir htdocsdir cgidir statedir manualdir proxycachedir]) dnl reparse the configure arguments. APR_PARSE_ARGUMENTS