diff options
| author | Joe Orton <jorton@apache.org> | 2006-04-19 12:57:20 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2006-04-19 12:57:20 +0200 |
| commit | 4a7263af9a241274657732087dd7943f5bfebf8d (patch) | |
| tree | 2005e1bf96a43f7eea5cf556744b077f8a44a9d1 | |
| parent | Fix for platforms without threads: inreslist exists only if APR_HAS_THREADS i... (diff) | |
| download | apache2-4a7263af9a241274657732087dd7943f5bfebf8d.tar.xz apache2-4a7263af9a241274657732087dd7943f5bfebf8d.zip | |
* configure.in: Add --with-included-apr flag to force use of the
bundled copies of APR and APR-util.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395211 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 09ff3041a0..807adc67ce 100644 --- a/configure.in +++ b/configure.in @@ -61,7 +61,15 @@ 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)) + +if test "x$with_included_apr" = "xyes"; then + apr_found=reconfig + apr_config="$srcdir/srclib/apr/apr-1-config" +else + APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1) +fi if test "$apr_found" = "no"; then AC_MSG_ERROR([APR not found. Please read the documentation.]) @@ -89,7 +97,12 @@ 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) +if test "x$with_included_apr" = "xyes"; then + apu_found=reconfig + apu_config="${srcdir}/srclib/apr-util/apu-1-config" +else + APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, 1) +fi if test "$apu_found" = "no"; then AC_MSG_ERROR([APR-util not found. Please read the documentation.]) |