From f9ad7c6a53d73247221a4a47d8d599d7417f2d4d Mon Sep 17 00:00:00 2001
From: Friedhelm Betz <betz@php.net>
Date: Mon, 12 May 2003 00:51:47 +0000
Subject: [PATCH] some configure options moved around some sapi configure
 options added rudiment version infos

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@126601 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters/install.configure.misc.xml    |  36 +------
 chapters/install.configure.servers.xml | 128 ++++++++++++++++++++++++-
 2 files changed, 126 insertions(+), 38 deletions(-)

diff --git a/chapters/install.configure.misc.xml b/chapters/install.configure.misc.xml
index 795ad1aa9a..295fb17f92 100644
--- a/chapters/install.configure.misc.xml
+++ b/chapters/install.configure.misc.xml
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
  <sect3 id="install.configure.options.misc">
   <title>Misc options</title>
   <variablelist>
-   <varlistentry id="install.configure.enable-force-cgi-redirect">
-    <term>
-     <parameter>--enable-force-cgi-redirect</parameter>
-    </term>
-    <listitem>
-     <para>
-      Enable the security check for internal server redirects. You should use 
-this 
-      if you are running the CGI version with Apache.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry id="install.configure.enable-discard-path">
-    <term>
-     <parameter>--enable-discard-path</parameter>
-    </term>
-    <listitem>
-     <para>
-      If this is enabled, the PHP CGI binary can safely be placed outside of 
-the web 
-      tree and people will not be able to circumvent .htaccess security.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry id="install.configure.with-fastcgi">
-    <term>
-     <parameter>--with-fastcgi</parameter>
-    </term>
-    <listitem>
-     <para>
-      Build PHP as FastCGI application.
-     </para>
-    </listitem>
-   </varlistentry>
    <varlistentry id="install.configure.enable-debug">
     <term>
      <parameter>--enable-debug</parameter>
diff --git a/chapters/install.configure.servers.xml b/chapters/install.configure.servers.xml
index 7ba64a69e7..72c803064d 100644
--- a/chapters/install.configure.servers.xml
+++ b/chapters/install.configure.servers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
  <sect3 id="install.configure.options.servers">
   <title>Server options</title>
   <variablelist>
@@ -58,13 +58,52 @@
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry id="install.configure.with-caudium">
+    <term>
+     <parameter>--with-caudium=DIR </parameter>
+    </term>
+    <listitem>
+     <para>
+      Build PHP as a Pike module for use with Caudium. DIR is the Caudium server
+      dir, with the default value <filename>/usr/local/caudium/server.</filename> 
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry id="install.configure.disable-cli">
+    <term>
+     <parameter>--disable-cli</parameter>
+    </term>
+    <listitem>
+     <para>
+      Disable building the CLI version of PHP (this forces --without-pear).
+      Available with PHP 4.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry id="install.configure.enable-embed">
+    <term>
+     <parameter> --enable-embed[=TYPE]</parameter>
+    </term>
+    <listitem>
+     <para>
+      Enable building of the embedded SAPI library. TYPE is either shared or
+      static, which defaults to shared. Available with PHP 4.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+        
    <varlistentry id="install.configure.with-fhttpd">
     <term>
      <parameter>--with-fhttpd[=DIR]</parameter>
     </term>
     <listitem>
      <para>
-      Build fhttpd module. DIR is the fhttpd sources directory, defaults to /usr/local/src/fhttpd.
+      Build fhttpd module. DIR is the fhttpd sources directory, defaults to
+      <filename>/usr/local/src/fhttpd</filename>. No longer available as of PHP
+      4.3.0.
      </para>
     </listitem>
    </varlistentry>
@@ -115,7 +154,7 @@
     <listitem>
      <para>
       Build PHP as a Pike module. DIR is the base Roxen directory, normally 
-      /usr/local/roxen/server.
+      <filename>/usr/local/roxen/server</filename>.
      </para>
     </listitem>
    </varlistentry>
@@ -150,6 +189,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry id="install.configure.with-tux">
     <term>
      <parameter>--with-tux=MODULEDIR</parameter>
@@ -160,6 +200,88 @@
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry id="install.configure.with-webjames">
+    <term>
+     <parameter>--with-webjames=SRCDIR</parameter>
+    </term>
+    <listitem>
+     <para>
+      Build PHP as a WebJames module (RISC OS only)
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry id="install.configure.disable-cgi">
+    <term>
+     <parameter> --disable-cgi</parameter>
+    </term>
+    <listitem>
+     <para>
+      Disable building CGI version of PHP. Available with PHP 4.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+  
+   <varlistentry id="install.configure.enable-force-cgi-redirect">
+    <term>
+     <parameter>--enable-force-cgi-redirect</parameter>
+    </term>
+    <listitem>
+     <para>
+      Enable the security check for internal server redirects. You should use 
+      this if you are running the CGI version with Apache.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry id="install.configure.enable-discard-path">
+    <term>
+     <parameter>--enable-discard-path</parameter>
+    </term>
+    <listitem>
+     <para>
+      If this is enabled, the PHP CGI binary can safely be placed outside of 
+      the web tree and people will not be able to circumvent
+      <filename>.htaccess</filename>security.
+     </para>
+    </listitem>
+   </varlistentry>
+   
+   <varlistentry id="install.configure.with-fastcgi">
+    <term>
+     <parameter>--with-fastcgi</parameter>
+    </term>
+    <listitem>
+     <para>
+      Build PHP as FastCGI application. No longer available as of PHP 4.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry id="install.configure.enable-fastcgi">
+    <term>
+     <parameter>--enable-fastcgi</parameter>
+    </term>
+    <listitem>
+     <para>
+      If this is enabled, the CGI module will be built with support for fastcgi
+      also. Available since PHP 4.3.0
+     </para>
+    </listitem>
+   </varlistentry>
+   
+   <varlistentry id="install.configure.disable-path-info-check">
+    <term>
+     <parameter>--disable-path-info-check</parameter>
+    </term>
+    <listitem>
+     <para>
+      If this is disabled, paths such as /info.php/test?a=b will fail to work.
+      Available since PHP 4.3.0
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </sect3>