Fix error message for included apr flag.
Forward port of r1241897 and r1243670
from 2.4.x plus one shell syntax fix.
Will backport the fix to 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243797 13f79535-47bb-0310-9956-
ffa450edef68
if test "x$with_included_apr" = "xyes"; then
apr_found=reconfig
if test ! -d srclib/apr; then
if test "x$with_included_apr" = "xyes"; then
apr_found=reconfig
if test ! -d srclib/apr; then
- AC_MSG_ERROR([Bundled APR requested but not found at srclib/apr. Download and unpack the corresponding httpd-${HTTPD_VERSION}-deps package over this one.])
+ if test ! -d srclib/apr && test ! -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
APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2)
fi
else
APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2)
apu_found=obsolete
elif test "x$with_included_apr" = "xyes"; then
apu_found=reconfig
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 && test ! -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
fi
else
dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x