From: Colm MacCarthaigh <colm@apache.org>
Date: Thu, 1 Dec 2005 12:55:45 +0000 (+0000)
Subject: Make the apr/apr-util 1.2 instructions more explicit and hopefully
X-Git-Tag: 2.2.1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b68450b6d1a25e2d577d86847a1674700232b3b;p=thirdparty%2Fapache%2Fhttpd.git

Make the apr/apr-util 1.2 instructions more explicit and hopefully
more clear.


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

diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index b1764dbea59..ca4617a2854 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -166,21 +166,28 @@
       <dd><code>apr</code> and <code>apr-util</code> are bundled
       with the Apache httpd source releases, and will be used without any 
       problems in almost all circumstances. However, if 
-      <code>apr</code> or <code>apr-util</code> 1.0 or 1.1 
-      installed on your system you must decide to upgrade your
+      <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 to have httpd use seperate builds. To use the bundled 
+      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 <code class="program"><a href="./programs/configure.html">configure</a></code> them manually:
+      purpose you must install them manually:
 <div class="example"><p><code>
-# Configure apr 1.2<br />
-cd srclib/apr ; ./configure<br />
+# Build and install apr 1.2<br />
+cd srclib/apr<br />
+./configure --prefix=/usr/local/apr-httpd/<br />
+make<br />
+make install<br />
 <br />
-# Configure apr-util 1.2<br />
-cd ../apr-util ; ./configure --with-apr=../apr<br />
+# Build and install apr-util 1.2<br />
+cd ../apr-util<br />
+./configure --prefix=/usr/local/apr-util-httpd/ --with-apr=/usr/local/apr-httpd/<br />
+make<br />
+make install<br />
 <br />
 # Configure httpd<br />
-cd ../../ ; ./configure --with-apr=srclib/apr --with-apr-util=srclib/apr-util<br />
+cd ../../<br />
+./configure --with-apr=/usr/local/apr-httpd/ --with-apr-util=/usr/local/apr-util-httpd/<br />
 </code></p></div>
       </dd>
     </dl>
diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index eef8752f70c..4d5f5e4e60d 100644
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -162,21 +162,28 @@
       <dd><code>apr</code> and <code>apr-util</code> are bundled
       with the Apache httpd source releases, and will be used without any 
       problems in almost all circumstances. However, if 
-      <code>apr</code> or <code>apr-util</code> 1.0 or 1.1 
-      installed on your system you must decide to upgrade your
+      <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 to have httpd use seperate builds. To use the bundled 
+      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 <program>configure</program> them manually:
+      purpose you must install them manually:
 <example>
-# Configure apr 1.2<br />
-cd srclib/apr ; ./configure<br />
+# Build and install apr 1.2<br />
+cd srclib/apr<br/>
+./configure --prefix=/usr/local/apr-httpd/<br/>
+make<br/>
+make install<br />
 <br />
-# Configure apr-util 1.2<br />
-cd ../apr-util ; ./configure --with-apr=../apr<br />
+# Build and install apr-util 1.2<br />
+cd ../apr-util<br />
+./configure --prefix=/usr/local/apr-util-httpd/ --with-apr=/usr/local/apr-httpd/<br />
+make<br/>
+make install<br />
 <br />
 # Configure httpd<br />
-cd ../../ ; ./configure --with-apr=srclib/apr --with-apr-util=srclib/apr-util<br />
+cd ../../<br />
+./configure --with-apr=/usr/local/apr-httpd/ --with-apr-util=/usr/local/apr-util-httpd/<br />
 </example>
       </dd>
     </dl>
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index 90cbe269a0d..e5e4ed72363 100644
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 333030:350232 (outdated) -->
+<!-- English Revision: 333030:350236 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index 8710718b2e1..4cced8b4a17 100644
--- a/docs/manual/install.xml.es
+++ b/docs/manual/install.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:350232 (outdated) -->
+<!-- English Revision: 105989:350236 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr
index 8e0698ff76b..3fad58be7e9 100644
--- a/docs/manual/install.xml.fr
+++ b/docs/manual/install.xml.fr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 105989:350232 (outdated) -->
+<!-- English Revision: 105989:350236 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index 5ab6d83a42f..7a55f6f12bd 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 178520:350232 (outdated) -->
+<!-- English Revision: 178520:350236 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index 28b2c490133..cf40e95516b 100644
--- a/docs/manual/install.xml.ko
+++ b/docs/manual/install.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:350232 (outdated) -->
+<!-- English Revision: 105989:350236 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,