You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2012/02/13 21:02:02 UTC
svn commit: r1243670 - in /httpd/httpd/branches/2.4.x: CHANGES configure.in
Author: rjung
Date: Mon Feb 13 20:02:01 2012
New Revision: 1243670
URL: http://svn.apache.org/viewvc?rev=1243670&view=rev
Log:
Fix out of tree build using apr and apr-util in srclib.
Also rephrase remaining mentioning of the deps package.
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/configure.in
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1243670&r1=1243669&r2=1243670&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Feb 13 20:02:01 2012
@@ -3,6 +3,11 @@
Changes with Apache 2.4.2
+Changes with Apache 2.4.2
+
+ *) configure: Fix out of tree build using apr and apr-util in srclib.
+ [Rainer Jung]
+
Changes with Apache 2.4.1
*) SECURITY: CVE-2012-0053 (cve.mitre.org)
Modified: httpd/httpd/branches/2.4.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/configure.in?rev=1243670&r1=1243669&r2=1243670&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/configure.in (original)
+++ httpd/httpd/branches/2.4.x/configure.in Mon Feb 13 20:02:01 2012
@@ -87,7 +87,7 @@ APACHE_HELP_STRING(--with-included-apr,U
if test "x$with_included_apr" = "xyes"; then
apr_found=reconfig
- if test ! -d srclib/apr; then
+ if test ! -d srclib/apr && ! -d $srcdir/srclib/apr; then
AC_MSG_ERROR([Bundled APR requested but not found at ./srclib/. Download and unpack the corresponding apr and apr-util packages to ./srclib/.])
fi
else
@@ -136,8 +136,8 @@ if test "x${apr_major_version}" = "x2";
apu_found=obsolete
elif test "x$with_included_apr" = "xyes"; then
apu_found=reconfig
- if test ! -d srclib/apr-util; then
- AC_MSG_ERROR([Bundled APR-Util requested but not found at srclib/apr-util. Download and unpack the corresponding httpd-${HTTPD_VERSION}-deps package over this one.])
+ if test ! -d srclib/apr-util && ! -d $srcdir/srclib/apr-util; then
+ AC_MSG_ERROR([Bundled APR-Util requested but not found at ./srclib/. Download and unpack the corresponding apr and apr-util packages to ./srclib/.])
fi
else
dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x