You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2006/04/19 12:57:32 UTC
svn commit: r395211 - /httpd/httpd/trunk/configure.in
Author: jorton
Date: Wed Apr 19 03:57:20 2006
New Revision: 395211
URL: http://svn.apache.org/viewcvs?rev=395211&view=rev
Log:
* configure.in: Add --with-included-apr flag to force use of the
bundled copies of APR and APR-util.
Modified:
httpd/httpd/trunk/configure.in
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/configure.in?rev=395211&r1=395210&r2=395211&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Wed Apr 19 03:57:20 2006
@@ -61,7 +61,15 @@
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 @@
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.])
Re: svn commit: r395211 - /httpd/httpd/trunk/configure.in
Posted by Joe Orton <jo...@redhat.com>.
On Thu, May 25, 2006 at 09:01:44PM +0200, Ruediger Pluem wrote:
> On 04/19/2006 12:57 PM,
> > Author: jorton
> > Date: Wed Apr 19 03:57:20 2006
> > New Revision: 395211
...
> > +if test "x$with_included_apr" = "xyes"; then
> > + apr_found=reconfig
> > + apr_config="$srcdir/srclib/apr/apr-1-config"
> > +else
>
> Is it really a good idea to hardcode apr-1-config or shouldn't it be something like
> apr-?-config (Same question for apu-1-config below)?
The "1" requirement is hardcoded in the APR_FIND_APx calls anyway, so I
don't think this is a big deal. They could all be replaced with some
variable I suppose.
> > +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
joe
Re: svn commit: r395211 - /httpd/httpd/trunk/configure.in
Posted by Ruediger Pluem <rp...@apache.org>.
On 04/19/2006 12:57 PM,
> Author: jorton
> Date: Wed Apr 19 03:57:20 2006
> New Revision: 395211
>
> URL: http://svn.apache.org/viewcvs?rev=395211&view=rev
> Log:
> * configure.in: Add --with-included-apr flag to force use of the
> bundled copies of APR and APR-util.
>
> Modified:
> httpd/httpd/trunk/configure.in
>
> +
> +if test "x$with_included_apr" = "xyes"; then
> + apr_found=reconfig
> + apr_config="$srcdir/srclib/apr/apr-1-config"
> +else
Is it really a good idea to hardcode apr-1-config or shouldn't it be something like
apr-?-config (Same question for apu-1-config below)?
> +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
>
Regards
Rüdiger