Skip to content

Update to the configure.in #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PaulLodge wants to merge 1 commit into
base: trunk
Choose a base branch
from
+10 −1
Open

Update to the configure.in #654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,22 @@ AC_MSG_NOTICE([])
if test "x${apr_major_version}" = "x2"; then
apu_found=obsolete
elif test "x$with_included_apr" = "xyes"; then
dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x
dnl isn't supported.

if test "x${apr_major_version}" = "x1"; then
AC_MSG_ERROR([HTTPD Trunk version, APR 1.x not supported. Please refer to the documentation on APR in the httpd INSTALL file.])
fi
apu_found=reconfig
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/. Please refer to the documentation on APR in the httpd INSTALL file.])
fi
else
dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x
dnl isn't supported.
dnl isn't supported.
if test "x${apr_major_version}" = "x1"; then
AC_MSG_ERROR([HTTPD Trunk version, APR 1.x not supported. Please refer to the documentation on APR in the httpd INSTALL file.])
fi
ifdef([APR_FIND_APU], [
APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util",
1, ${apr_major_version})
Expand Down