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 5825ca82fea24038b100a48b25e03b6b37248058..943bf0c34f25bf6471c35fd0575bf6357428b91b 100644 (file)
--- 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 326b8bb5be0c2763813e7155914c469247513878..9f960963aea8e7e78d1b76303f5af46d035a3e0b 100644 (file)
--- 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