Mention --with-included-apr.

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

diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index d460574c5ae6de8727e2cc27772f7173b9d8a892..3ed0b88106f2fa325bdc08c76cccc60c7e2e762e 100644 (file)
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -169,9 +169,21 @@
       <code>apr</code> or <code>apr-util</code>, versions 1.0 or 1.1,
       are installed on your system, you must either upgrade your
       <code>apr</code>/<code>apr-util</code> installations to
-      1.2, or have httpd use seperate builds. To use the bundled 
-      <code>apr</code>/<code>apr-util</code> sources for this
-      purpose you must install them manually:
+      1.2, force the use of the bundled libraries or have httpd use 
+      separate builds. To use the bundled 
+      <code>apr</code>/<code>apr-util</code> sources specify the 
+      <code>--with-included-apr</code> option to configure:
+      
+      <div class="note"><h3>Note</h3>
+        The --with-included-apr option was added in version 2.2.3
+      </div>
+      <div class="example"><p><code>
+        # Force the use of the bundled apr/apr-util<br />
+        ./configure --with-included-apr<br />
+      </code></p></div>
+      
+      To build Apache HTTPd against a manually installed 
+      <code>apr</code>/<code>apr-util</code>:
       <div class="example"><p><code>
         # Build and install apr 1.2<br />
         cd srclib/apr<br />

diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index 85547cb4fb2afa3d09c418b69df4118aa7c8d26e..95c0db2b294792271eff8df739d969d83e0e6395 100644 (file)
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -165,9 +165,21 @@
       <code>apr</code> or <code>apr-util</code>, versions 1.0 or 1.1,
       are installed on your system, you must either upgrade your
       <code>apr</code>/<code>apr-util</code> installations to
-      1.2, or have httpd use seperate builds. To use the bundled 
-      <code>apr</code>/<code>apr-util</code> sources for this
-      purpose you must install them manually:
+      1.2, force the use of the bundled libraries or have httpd use 
+      separate builds. To use the bundled 
+      <code>apr</code>/<code>apr-util</code> sources specify the 
+      <code>--with-included-apr</code> option to configure:
+      
+      <note><title>Note</title>
+        The --with-included-apr option was added in version 2.2.3
+      </note>
+      <example>
+        # Force the use of the bundled apr/apr-util<br />
+        ./configure --with-included-apr<br />
+      </example>
+      
+      To build Apache HTTPd against a manually installed 
+      <code>apr</code>/<code>apr-util</code>:
       <example>
         # Build and install apr 1.2<br />
         cd srclib/apr<br/>