More apache 1.3.11 changes

1 files changed, 16 insertions, 33 deletions

diff --git a/usr.sbin/httpd/README.configure b/usr.sbin/httpd/README.configure
index 4a7e0c50031..4c2b4e7da17 100644
--- a/usr.sbin/httpd/README.configure
+++ b/usr.sbin/httpd/README.configure
@@ -64,27 +64,27 @@
     $ make install
 
   This builds Apache 1.3 with the standard set of enabled modules
-  (automatically determined from src/Configuration.tmpl) with a GNU-conforming
-  subdirectory layout under /path/to/apache. For using the old Apache 1.2
-  subdirectory layout additionally use the --compat option:
+  (automatically determined from src/Configuration.tmpl) with an Apache 1.2
+  conforming subdirectory layout under /path/to/apache. For using the GNU
+  style subdirectory layout additionally use the --with-layout=GNU option:
 
-    $ ./configure --compat --prefix=/path/to/apache
+    $ ./configure --with-layout=GNU --prefix=/path/to/apache
     $ make
     $ make install
 
   If you are not sure which directory layout you want, you can use the
-  --layout option. It displays the directory layout which would be used but
-  immediately exits without configuring anything. Examples:
+  --show-layout option. It displays the directory layout which would be used
+  but immediately exits without configuring anything. Examples:
 
-    $ ./configure --layout
-    $ ./configure --prefix=/path/to/apache --layout
-    $ ./configure --compat --prefix=/path/to/apache --layout
+    $ ./configure --show-layout
+    $ ./configure --prefix=/path/to/apache --show-layout
+    $ ./configure --with-layout=GNU --prefix=/path/to/apache --show-layout
 
   Additionally if some of the shown paths still don't fit for your particular
   situation, you can use the --bindir, --sbindir, --libexecdir, --mandir,
   --sysconfdir, --datadir, --localstatedir, --runtimedir, --logfiledir and
   --proxycachedir options to adjust the layout as required. Always check with
-  --layout the resulting directory layout which would be used for
+  --show-layout the resulting directory layout which would be used for
   installation.
 
   suEXEC support
@@ -263,28 +263,7 @@
     $ make 
     $ make install
     
-  2. How you can install Apache with a dynamically linked PHP:
-
-    $ gunzip <apache_1.3.X.tar.gz | tar xvf -
-    $ gunzip <php-3.0.tar.gz | tar xvf -
-    $ cd apache_1.3.X
-    $ ./configure --prefix=/path/to/apache
-    $ cd ../php-3.0
-    $ ./configure --with-shared-apache=../apache_1.3.X
-    $ make
-    $ make install
-
-    [optionally you now have the chance to prepare or add more 
-     third-party modules to the Apache source tree]
-
-    $ cd ../apache_1.3.X
-    $ ./configure --prefix=/path/to/apache \
-                  --activate-module=src/modules/php3/libphp3.a \
-                  --enable-shared=php3
-    $ make 
-    $ make install
-
-  3. You can also use APXS:
+  2. You can also use APXS:
 
     $ cd apache-1.3.X
     $ ./configure --prefix=/path/to/apache --enable-shared=max
@@ -298,8 +277,12 @@
     $ make install
 
   At this point don't forget to edit your conf/httpd.conf file and
-  make sure the file contains the line:
+  make sure the file contains the line for PHP 3:
 
     AddType application/x-httpd-php3 .php3
 
+  Or this line for PHP 4:
+
+    AddType application/x-httpd-php .php
+
   Then restart your server.