httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r410828 - /httpd/httpd/trunk/configure.in
Date Thu, 01 Jun 2006 10:45:06 GMT
Author: jorton
Date: Thu Jun  1 03:45:06 2006
New Revision: 410828

URL: http://svn.apache.org/viewvc?rev=410828&view=rev
Log:
* configure.in: Use common variables for the required APR/APR-util
version.

Modified:
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=410828&r1=410827&r2=410828&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Thu Jun  1 03:45:06 2006
@@ -64,11 +64,14 @@
 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 @@
 
 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



Mime
View raw message