From: Rainer Jung <rjung@apache.org>
Date: Mon, 13 Feb 2012 20:02:01 +0000 (+0000)
Subject: Fix out of tree build using apr and apr-util in srclib.
X-Git-Tag: 2.4.2~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69a1a19a3fbd1d5bbac82b42fb69c60b4c2bed03;p=apache

Fix out of tree build using apr and apr-util in srclib.

Also rephrase remaining mentioning of the deps package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1243670 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 5825ca82fe..943bf0c34f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/configure.in b/configure.in
index 326b8bb5be..9f960963ae 100644
--- a/configure.in
+++ b/configure.in
@@ -87,7 +87,7 @@ APACHE_HELP_STRING(--with-included-apr,Use bundled copies of APR/APR-Util))
 
 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"; then
   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