Commit d1e67d06 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r395211, r410828 from trunk: 

* configure.in: Add --with-included-apr flag to force use of the
bundled copies of APR and APR-util.

* configure.in: Use common variables for the required APR/APR-util
version.

Reviewed by: jorton, rpluem, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424693 13f79535-47bb-0310-9956-ffa450edef68
parent 73beff8b

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.3









  *) configure: Add "--with-included-apr" flag to force use of the









     bundled version of APR at build time.  [Joe Orton]

















  *) Respect GracefulShutdownTimeout in the worker and event MPMs.









     [Chris Darroch, Garrett Rooney]










































configure.in



+21
−2



























Changes for configure.in: 21 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -61,7 +61,18 @@ orig_prefix="$prefix"

















echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"



















APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1)









AC_ARG_WITH(included-apr,









APACHE_HELP_STRING(--with-included-apr,Use bundled copies of APR/APR-Util))



















# Only APR 1.x is supported.









apr_version=1



















if test "x$with_included_apr" = "xyes"; then









   apr_found=reconfig









   apr_config="$srcdir/srclib/apr/apr-${apr_version}-config"









else 









   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, ${apr_version})









fi



















if test "$apr_found" = "no"; then









  AC_MSG_ERROR([APR not found.  Please read the documentation.])










@@ -89,7 +100,15 @@ APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"

















echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"



















APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, 1)









# Only APR-util 1.x is supported.









apu_version=1



















if test "x$with_included_apr" = "xyes"; then









   apu_found=reconfig









   apu_config="${srcdir}/srclib/apr-util/apu-${apu_version}-config"









else 









   APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apu_version})









fi



















if test "$apu_found" = "no"; then









  AC_MSG_ERROR([APR-util not found.  Please read the documentation.])