From: Joe Orton <jorton@apache.org>
Date: Thu, 1 Jun 2006 10:45:06 +0000 (+0000)
Subject: * configure.in: Use common variables for the required APR/APR-util
X-Git-Tag: 2.3.0~2365
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2902ceaa3ffdb5175c44de67286defdfbca080a0;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410828 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/configure.in b/configure.in
index 5bdaa13ee2..29baee7c8f 100644
--- a/configure.in
+++ b/configure.in
@@ -64,11 +64,14 @@ echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 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-1-config"
+   apr_config="$srcdir/srclib/apr/apr-${apr_version}-config"
 else 
-   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1)
+   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, ${apr_version})
 fi
 
 if test "$apr_found" = "no"; then
@@ -97,11 +100,14 @@ APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
+# 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-1-config"
+   apu_config="${srcdir}/srclib/apr-util/apu-${apu_version}-config"
 else 
-   APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, 1)
+   APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apu_version})
 fi
 
 if test "$apu_found" = "no"; then